appflare 0.2.48 → 0.2.49

package/cli/utils/schema-discovery.ts

@@ -1,399 +1,402 @@
-import { readdir } from "node:fs/promises";
-import { resolve } from "node:path";
-import type { LoadedAppflareConfig } from "../types";
-
-export type DiscoveredColumn = {
-	name: string;
-	expression: string;
-	type: "string" | "number" | "boolean" | "date" | "unknown";
-	optional: boolean;
-	primaryKey: boolean;
-	autoIncrement: boolean;
-};
-
-export type DiscoveredTable = {
-	exportName: string;
-	tableName: string;
-	columns: DiscoveredColumn[];
-};
-
-export type DiscoveredSchema = {
-	schemaPath: string;
-	tables: DiscoveredTable[];
-};
-
-function splitTopLevel(value: string): string[] {
-	const result: string[] = [];
-	let current = "";
-	let depthParen = 0;
-	let depthBrace = 0;
-	let depthBracket = 0;
-	let inSingleQuote = false;
-	let inDoubleQuote = false;
-	let inTemplateString = false;
-	let escaped = false;
-
-	for (let i = 0; i < value.length; i += 1) {
-		const char = value[i];
-
-		if (escaped) {
-			current += char;
-			escaped = false;
-			continue;
-		}
-
-		if (char === "\\") {
-			current += char;
-			escaped = true;
-			continue;
-		}
-
-		if (!inDoubleQuote && !inTemplateString && char === "'") {
-			inSingleQuote = !inSingleQuote;
-			current += char;
-			continue;
-		}
-
-		if (!inSingleQuote && !inTemplateString && char === '"') {
-			inDoubleQuote = !inDoubleQuote;
-			current += char;
-			continue;
-		}
-
-		if (!inSingleQuote && !inDoubleQuote && char === "`") {
-			inTemplateString = !inTemplateString;
-			current += char;
-			continue;
-		}
-
-		if (inSingleQuote || inDoubleQuote || inTemplateString) {
-			current += char;
-			continue;
-		}
-
-		if (char === "(") {
-			depthParen += 1;
-		} else if (char === ")") {
-			depthParen -= 1;
-		} else if (char === "{") {
-			depthBrace += 1;
-		} else if (char === "}") {
-			depthBrace -= 1;
-		} else if (char === "[") {
-			depthBracket += 1;
-		} else if (char === "]") {
-			depthBracket -= 1;
-		}
-
-		if (
-			char === "," &&
-			depthParen === 0 &&
-			depthBrace === 0 &&
-			depthBracket === 0
-		) {
-			const segment = current.trim();
-			if (segment.length > 0) {
-				result.push(segment);
-			}
-			current = "";
-			continue;
-		}
-
-		current += char;
-	}
-
-	const trailing = current.trim();
-	if (trailing.length > 0) {
-		result.push(trailing);
-	}
-
-	return result;
-}
-
-function getTopLevelColonIndex(entry: string): number {
-	let depthParen = 0;
-	let depthBrace = 0;
-	let depthBracket = 0;
-	let inSingleQuote = false;
-	let inDoubleQuote = false;
-	let inTemplateString = false;
-	let escaped = false;
-
-	for (let i = 0; i < entry.length; i += 1) {
-		const char = entry[i];
-
-		if (escaped) {
-			escaped = false;
-			continue;
-		}
-
-		if (char === "\\") {
-			escaped = true;
-			continue;
-		}
-
-		if (!inDoubleQuote && !inTemplateString && char === "'") {
-			inSingleQuote = !inSingleQuote;
-			continue;
-		}
-
-		if (!inSingleQuote && !inTemplateString && char === '"') {
-			inDoubleQuote = !inDoubleQuote;
-			continue;
-		}
-
-		if (!inSingleQuote && !inDoubleQuote && char === "`") {
-			inTemplateString = !inTemplateString;
-			continue;
-		}
-
-		if (inSingleQuote || inDoubleQuote || inTemplateString) {
-			continue;
-		}
-
-		if (char === "(") {
-			depthParen += 1;
-			continue;
-		}
-		if (char === ")") {
-			depthParen -= 1;
-			continue;
-		}
-		if (char === "{") {
-			depthBrace += 1;
-			continue;
-		}
-		if (char === "}") {
-			depthBrace -= 1;
-			continue;
-		}
-		if (char === "[") {
-			depthBracket += 1;
-			continue;
-		}
-		if (char === "]") {
-			depthBracket -= 1;
-			continue;
-		}
-
-		if (
-			char === ":" &&
-			depthParen === 0 &&
-			depthBrace === 0 &&
-			depthBracket === 0
-		) {
-			return i;
-		}
-	}
-
-	return -1;
-}
-
-function inferColumnType(expression: string): DiscoveredColumn["type"] {
-	const lowered = expression.toLowerCase();
-	if (/mode\s*:\s*["'`](timestamp|timestamp_ms)["'`]/.test(lowered)) {
-		return "date";
-	}
-	if (/mode\s*:\s*["'`]boolean["'`]/.test(lowered)) {
-		return "boolean";
-	}
-	if (/\.(date|datetime|timestamp)\s*\(/.test(lowered)) {
-		return "date";
-	}
-	if (/\.(int|integer|real|numeric|decimal|float|double)\s*\(/.test(lowered)) {
-		return "number";
-	}
-	if (/\.(text|varchar|char)\s*\(/.test(lowered)) {
-		return "string";
-	}
-	if (/\.(boolean|bool)\s*\(/.test(lowered)) {
-		return "boolean";
-	}
-	return "unknown";
-}
-
-function discoverColumns(rawColumns: string): DiscoveredColumn[] {
-	const entries = splitTopLevel(rawColumns);
-	const columns: DiscoveredColumn[] = [];
-
-	for (const entry of entries) {
-		const colonIndex = getTopLevelColonIndex(entry);
-		if (colonIndex === -1) {
-			continue;
-		}
-
-		const key = entry
-			.slice(0, colonIndex)
-			.trim()
-			.replace(/^['"]|['"]$/g, "");
-		if (!key) {
-			continue;
-		}
-
-		const expression = entry.slice(colonIndex + 1).trim();
-		const primaryKey = /\.primarykey\s*\(/i.test(expression);
-		const autoIncrement = /autoincrement\s*:\s*true/i.test(expression);
-		const hasDefault = /\.default\s*\(/i.test(expression);
-		const notNull = /\.notnull\s*\(/i.test(expression);
-		const optional = !notNull || hasDefault || autoIncrement || primaryKey;
-
-		columns.push({
-			name: key,
-			expression,
-			type: inferColumnType(expression),
-			optional,
-			primaryKey,
-			autoIncrement,
-		});
-	}
-
-	return columns;
-}
-
-function discoverTables(schemaSource: string): DiscoveredTable[] {
-	const tablePattern =
-		/export\s+const\s+(\w+)\s*=\s*table\s*\(\s*["'`]([^"'`]+)["'`]/g;
-	const tables: DiscoveredTable[] = [];
-
-	const findMatchingBrace = (source: string, startIndex: number): number => {
-		let depth = 0;
-		let inSingleQuote = false;
-		let inDoubleQuote = false;
-		let inTemplateString = false;
-		let escaped = false;
-
-		for (let i = startIndex; i < source.length; i += 1) {
-			const char = source[i];
-
-			if (escaped) {
-				escaped = false;
-				continue;
-			}
-
-			if (char === "\\") {
-				escaped = true;
-				continue;
-			}
-
-			if (!inDoubleQuote && !inTemplateString && char === "'") {
-				inSingleQuote = !inSingleQuote;
-				continue;
-			}
-
-			if (!inSingleQuote && !inTemplateString && char === '"') {
-				inDoubleQuote = !inDoubleQuote;
-				continue;
-			}
-
-			if (!inSingleQuote && !inDoubleQuote && char === "`") {
-				inTemplateString = !inTemplateString;
-				continue;
-			}
-
-			if (inSingleQuote || inDoubleQuote || inTemplateString) {
-				continue;
-			}
-
-			if (char === "{") {
-				depth += 1;
-				continue;
-			}
-
-			if (char === "}") {
-				depth -= 1;
-				if (depth === 0) {
-					return i;
-				}
-			}
-		}
-
-		return -1;
-	};
-
-	let match = tablePattern.exec(schemaSource);
-	while (match) {
-		const exportName = match[1];
-		const tableName = match[2];
-		const objectStart = schemaSource.indexOf("{", tablePattern.lastIndex);
-		if (objectStart === -1) {
-			match = tablePattern.exec(schemaSource);
-			continue;
-		}
-
-		const objectEnd = findMatchingBrace(schemaSource, objectStart);
-		if (objectEnd === -1) {
-			match = tablePattern.exec(schemaSource);
-			continue;
-		}
-
-		const rawColumns = schemaSource.slice(objectStart + 1, objectEnd);
-		tables.push({
-			exportName,
-			tableName,
-			columns: discoverColumns(rawColumns),
-		});
-		match = tablePattern.exec(schemaSource);
-	}
-
-	return tables;
-}
-
-async function findSchemaCandidates(dirPath: string): Promise<string[]> {
-	const entries = await readdir(dirPath, { withFileTypes: true });
-	const discovered: string[] = [];
-
-	for (const entry of entries) {
-		if (entry.name.startsWith(".")) {
-			continue;
-		}
-		if (entry.name === "node_modules" || entry.name === "_generated") {
-			continue;
-		}
-
-		const entryPath = resolve(dirPath, entry.name);
-		if (entry.isDirectory()) {
-			discovered.push(...(await findSchemaCandidates(entryPath)));
-			continue;
-		}
-
-		if (entry.isFile() && entry.name === "schema.ts") {
-			discovered.push(entryPath);
-		}
-	}
-
-	return discovered;
-}
-
-export async function discoverSchema(
-	loadedConfig: LoadedAppflareConfig,
-	prioritySchemaPaths: string[] = [],
-): Promise<DiscoveredSchema> {
-	const scanCandidates = await findSchemaCandidates(
-		loadedConfig.scanDirAbs,
-	).catch(() => []);
-
-	const fallbackCandidate = resolve(loadedConfig.configDir, "schema.ts");
-	const candidates = [
-		...prioritySchemaPaths,
-		...(scanCandidates.length ? scanCandidates : [fallbackCandidate]),
-	];
-
-	for (const schemaPath of candidates) {
-		const file = Bun.file(schemaPath);
-		if (!(await file.exists())) {
-			continue;
-		}
-		const source = await file.text();
-		const tables = discoverTables(source);
-		if (tables.length > 0) {
-			return {
-				schemaPath,
-				tables,
-			};
-		}
-	}
-
-	throw new Error(
-		`Unable to discover schema.ts under scanDir (${loadedConfig.scanDirAbs}) or fallback (${fallbackCandidate}).`,
-	);
-}
+import { readdir } from "node:fs/promises";
+import { resolve } from "node:path";
+import type { LoadedAppflareConfig } from "../types";
+
+export type DiscoveredColumn = {
+	name: string;
+	expression: string;
+	type: "string" | "number" | "boolean" | "date" | "json" | "unknown";
+	optional: boolean;
+	primaryKey: boolean;
+	autoIncrement: boolean;
+};
+
+export type DiscoveredTable = {
+	exportName: string;
+	tableName: string;
+	columns: DiscoveredColumn[];
+};
+
+export type DiscoveredSchema = {
+	schemaPath: string;
+	tables: DiscoveredTable[];
+};
+
+function splitTopLevel(value: string): string[] {
+	const result: string[] = [];
+	let current = "";
+	let depthParen = 0;
+	let depthBrace = 0;
+	let depthBracket = 0;
+	let inSingleQuote = false;
+	let inDoubleQuote = false;
+	let inTemplateString = false;
+	let escaped = false;
+
+	for (let i = 0; i < value.length; i += 1) {
+		const char = value[i];
+
+		if (escaped) {
+			current += char;
+			escaped = false;
+			continue;
+		}
+
+		if (char === "\\") {
+			current += char;
+			escaped = true;
+			continue;
+		}
+
+		if (!inDoubleQuote && !inTemplateString && char === "'") {
+			inSingleQuote = !inSingleQuote;
+			current += char;
+			continue;
+		}
+
+		if (!inSingleQuote && !inTemplateString && char === '"') {
+			inDoubleQuote = !inDoubleQuote;
+			current += char;
+			continue;
+		}
+
+		if (!inSingleQuote && !inDoubleQuote && char === "`") {
+			inTemplateString = !inTemplateString;
+			current += char;
+			continue;
+		}
+
+		if (inSingleQuote || inDoubleQuote || inTemplateString) {
+			current += char;
+			continue;
+		}
+
+		if (char === "(") {
+			depthParen += 1;
+		} else if (char === ")") {
+			depthParen -= 1;
+		} else if (char === "{") {
+			depthBrace += 1;
+		} else if (char === "}") {
+			depthBrace -= 1;
+		} else if (char === "[") {
+			depthBracket += 1;
+		} else if (char === "]") {
+			depthBracket -= 1;
+		}
+
+		if (
+			char === "," &&
+			depthParen === 0 &&
+			depthBrace === 0 &&
+			depthBracket === 0
+		) {
+			const segment = current.trim();
+			if (segment.length > 0) {
+				result.push(segment);
+			}
+			current = "";
+			continue;
+		}
+
+		current += char;
+	}
+
+	const trailing = current.trim();
+	if (trailing.length > 0) {
+		result.push(trailing);
+	}
+
+	return result;
+}
+
+function getTopLevelColonIndex(entry: string): number {
+	let depthParen = 0;
+	let depthBrace = 0;
+	let depthBracket = 0;
+	let inSingleQuote = false;
+	let inDoubleQuote = false;
+	let inTemplateString = false;
+	let escaped = false;
+
+	for (let i = 0; i < entry.length; i += 1) {
+		const char = entry[i];
+
+		if (escaped) {
+			escaped = false;
+			continue;
+		}
+
+		if (char === "\\") {
+			escaped = true;
+			continue;
+		}
+
+		if (!inDoubleQuote && !inTemplateString && char === "'") {
+			inSingleQuote = !inSingleQuote;
+			continue;
+		}
+
+		if (!inSingleQuote && !inTemplateString && char === '"') {
+			inDoubleQuote = !inDoubleQuote;
+			continue;
+		}
+
+		if (!inSingleQuote && !inDoubleQuote && char === "`") {
+			inTemplateString = !inTemplateString;
+			continue;
+		}
+
+		if (inSingleQuote || inDoubleQuote || inTemplateString) {
+			continue;
+		}
+
+		if (char === "(") {
+			depthParen += 1;
+			continue;
+		}
+		if (char === ")") {
+			depthParen -= 1;
+			continue;
+		}
+		if (char === "{") {
+			depthBrace += 1;
+			continue;
+		}
+		if (char === "}") {
+			depthBrace -= 1;
+			continue;
+		}
+		if (char === "[") {
+			depthBracket += 1;
+			continue;
+		}
+		if (char === "]") {
+			depthBracket -= 1;
+			continue;
+		}
+
+		if (
+			char === ":" &&
+			depthParen === 0 &&
+			depthBrace === 0 &&
+			depthBracket === 0
+		) {
+			return i;
+		}
+	}
+
+	return -1;
+}
+
+function inferColumnType(expression: string): DiscoveredColumn["type"] {
+	const lowered = expression.toLowerCase();
+	if (/mode\s*:\s*["'`](timestamp|timestamp_ms)["'`]/.test(lowered)) {
+		return "date";
+	}
+	if (/mode\s*:\s*["'`]boolean["'`]/.test(lowered)) {
+		return "boolean";
+	}
+	if (/\.(date|datetime|timestamp)\s*\(/.test(lowered)) {
+		return "date";
+	}
+	if (/\.(int|integer|real|numeric|decimal|float|double)\s*\(/.test(lowered)) {
+		return "number";
+	}
+	if (/mode\s*:\s*["'`]json["'`]/.test(lowered) || /\.json\s*\(/.test(lowered)) {
+		return "json";
+	}
+	if (/\.(text|varchar|char)\s*\(/.test(lowered)) {
+		return "string";
+	}
+	if (/\.(boolean|bool)\s*\(/.test(lowered)) {
+		return "boolean";
+	}
+	return "unknown";
+}
+
+function discoverColumns(rawColumns: string): DiscoveredColumn[] {
+	const entries = splitTopLevel(rawColumns);
+	const columns: DiscoveredColumn[] = [];
+
+	for (const entry of entries) {
+		const colonIndex = getTopLevelColonIndex(entry);
+		if (colonIndex === -1) {
+			continue;
+		}
+
+		const key = entry
+			.slice(0, colonIndex)
+			.trim()
+			.replace(/^['"]|['"]$/g, "");
+		if (!key) {
+			continue;
+		}
+
+		const expression = entry.slice(colonIndex + 1).trim();
+		const primaryKey = /\.primarykey\s*\(/i.test(expression);
+		const autoIncrement = /autoincrement\s*:\s*true/i.test(expression);
+		const hasDefault = /\.default\s*\(/i.test(expression);
+		const notNull = /\.notnull\s*\(/i.test(expression);
+		const optional = !notNull || hasDefault || autoIncrement || primaryKey;
+
+		columns.push({
+			name: key,
+			expression,
+			type: inferColumnType(expression),
+			optional,
+			primaryKey,
+			autoIncrement,
+		});
+	}
+
+	return columns;
+}
+
+function discoverTables(schemaSource: string): DiscoveredTable[] {
+	const tablePattern =
+		/export\s+const\s+(\w+)\s*=\s*table\s*\(\s*["'`]([^"'`]+)["'`]/g;
+	const tables: DiscoveredTable[] = [];
+
+	const findMatchingBrace = (source: string, startIndex: number): number => {
+		let depth = 0;
+		let inSingleQuote = false;
+		let inDoubleQuote = false;
+		let inTemplateString = false;
+		let escaped = false;
+
+		for (let i = startIndex; i < source.length; i += 1) {
+			const char = source[i];
+
+			if (escaped) {
+				escaped = false;
+				continue;
+			}
+
+			if (char === "\\") {
+				escaped = true;
+				continue;
+			}
+
+			if (!inDoubleQuote && !inTemplateString && char === "'") {
+				inSingleQuote = !inSingleQuote;
+				continue;
+			}
+
+			if (!inSingleQuote && !inTemplateString && char === '"') {
+				inDoubleQuote = !inDoubleQuote;
+				continue;
+			}
+
+			if (!inSingleQuote && !inDoubleQuote && char === "`") {
+				inTemplateString = !inTemplateString;
+				continue;
+			}
+
+			if (inSingleQuote || inDoubleQuote || inTemplateString) {
+				continue;
+			}
+
+			if (char === "{") {
+				depth += 1;
+				continue;
+			}
+
+			if (char === "}") {
+				depth -= 1;
+				if (depth === 0) {
+					return i;
+				}
+			}
+		}
+
+		return -1;
+	};
+
+	let match = tablePattern.exec(schemaSource);
+	while (match) {
+		const exportName = match[1];
+		const tableName = match[2];
+		const objectStart = schemaSource.indexOf("{", tablePattern.lastIndex);
+		if (objectStart === -1) {
+			match = tablePattern.exec(schemaSource);
+			continue;
+		}
+
+		const objectEnd = findMatchingBrace(schemaSource, objectStart);
+		if (objectEnd === -1) {
+			match = tablePattern.exec(schemaSource);
+			continue;
+		}
+
+		const rawColumns = schemaSource.slice(objectStart + 1, objectEnd);
+		tables.push({
+			exportName,
+			tableName,
+			columns: discoverColumns(rawColumns),
+		});
+		match = tablePattern.exec(schemaSource);
+	}
+
+	return tables;
+}
+
+async function findSchemaCandidates(dirPath: string): Promise<string[]> {
+	const entries = await readdir(dirPath, { withFileTypes: true });
+	const discovered: string[] = [];
+
+	for (const entry of entries) {
+		if (entry.name.startsWith(".")) {
+			continue;
+		}
+		if (entry.name === "node_modules" || entry.name === "_generated") {
+			continue;
+		}
+
+		const entryPath = resolve(dirPath, entry.name);
+		if (entry.isDirectory()) {
+			discovered.push(...(await findSchemaCandidates(entryPath)));
+			continue;
+		}
+
+		if (entry.isFile() && entry.name === "schema.ts") {
+			discovered.push(entryPath);
+		}
+	}
+
+	return discovered;
+}
+
+export async function discoverSchema(
+	loadedConfig: LoadedAppflareConfig,
+	prioritySchemaPaths: string[] = [],
+): Promise<DiscoveredSchema> {
+	const scanCandidates = await findSchemaCandidates(
+		loadedConfig.scanDirAbs,
+	).catch(() => []);
+
+	const fallbackCandidate = resolve(loadedConfig.configDir, "schema.ts");
+	const candidates = [
+		...prioritySchemaPaths,
+		...(scanCandidates.length ? scanCandidates : [fallbackCandidate]),
+	];
+
+	for (const schemaPath of candidates) {
+		const file = Bun.file(schemaPath);
+		if (!(await file.exists())) {
+			continue;
+		}
+		const source = await file.text();
+		const tables = discoverTables(source);
+		if (tables.length > 0) {
+			return {
+				schemaPath,
+				tables,
+			};
+		}
+	}
+
+	throw new Error(
+		`Unable to discover schema.ts under scanDir (${loadedConfig.scanDirAbs}) or fallback (${fallbackCandidate}).`,
+	);
+}