appflare 0.2.47 → 0.2.49

package/cli/templates/dashboard/builders/table-routes/fragments.ts

@@ -22,6 +22,8 @@ function columnTypeIcon(type: string): string {
 			return "mdi:toggle-switch-outline";
 		case "date":
 			return "mdi:calendar";
+		case "json":
+			return "mdi:code-braces";
 		default:
 			return "mdi:format-text";
 	}
@@ -52,13 +54,19 @@ export function buildColumnHeaders(
 		.join("");
 }
 
-export function buildRowCells(columns: string[], primaryKey?: string): string {
+export function buildRowCells(table: DiscoveredTable, columns: string[], primaryKey?: string): string {
 	return columns
 		.map((column) => {
+			const col = table.columns.find((c) => c.name === column);
+
 			if (primaryKey && column === primaryKey) {
 				return `<td><button type="button" class="truncate max-w-[200px] text-sm font-mono text-xs opacity-70 hover:opacity-100 cursor-copy text-left" title="Click to copy: \${String((row as any).${column} ?? '')}" data-copy-value="\${String((row as any).${column} ?? '')}" onclick="navigator.clipboard?.writeText(this.dataset.copyValue || '')">\${String((row as any).${column} ?? '')}</button></td>`;
 			}
 
+			if (col?.type === "json") {
+				return `<td>\${raw((() => { const __v = (row as any).${column}; if (__v === null || __v === undefined) return '<span class="opacity-30 text-xs">null</span>'; if (Array.isArray(__v)) { if (__v.length === 0) return '<span class="badge badge-ghost badge-sm font-mono text-xs">[ ]</span>'; return '<div class="flex flex-wrap gap-1 max-w-[200px]">' + __v.slice(0, 3).map((item) => '<span class="badge badge-ghost badge-xs font-mono">' + (typeof item === 'object' && item !== null ? JSON.stringify(item).slice(0, 20) + (JSON.stringify(item).length > 20 ? '…' : '') : String(item ?? '')) + '</span>').join('') + (__v.length > 3 ? '<span class="badge badge-ghost badge-xs opacity-50">+' + (__v.length - 3) + '</span>' : '') + '</div>'; } if (typeof __v === 'object') { const __s = JSON.stringify(__v); return '<span class="badge badge-outline badge-sm font-mono text-[10px]">' + __s.slice(0, 50) + (__s.length > 50 ? '…' : '') + '</span>'; } return String(__v ?? ''); })())}</td>`;
+			}
+
 			return `<td><div class="truncate max-w-[200px] text-sm" title="\${String((row as any).${column} ?? '')}">\${String((row as any).${column} ?? '')}</div></td>`;
 		})
 		.join("");
@@ -104,6 +112,24 @@ export function buildFieldInput(
 \t\t`;
 	}
 
+	if (column.type === "json") {
+		if (mode === "edit") {
+			return `
+\t\t<div class="form-control">
+\t\t\t<label class="label"><span class="label-text text-sm font-medium">${columnName}</span></label>
+\t\t\t<textarea name="${columnName}" class="textarea textarea-bordered w-full font-mono text-xs h-32"${requiredAttr}>\${typeof (row as any).${columnName} === 'string' ? (row as any).${columnName} : JSON.stringify((row as any).${columnName} ?? null, null, 2)}</textarea>
+\t\t</div>
+\t\t`;
+		}
+
+		return `
+\t\t<div class="form-control">
+\t\t\t<label class="label"><span class="label-text text-sm font-medium">${columnName}</span></label>
+\t\t\t<textarea name="${columnName}" class="textarea textarea-bordered w-full font-mono text-xs h-32" placeholder="null"${requiredAttr}></textarea>
+\t\t</div>
+\t\t`;
+	}
+
 	if (mode === "edit") {
 		const valueExpression =
 			column.type === "date"
@@ -180,6 +206,20 @@ export function buildPayloadAssignments(
 \t\t`;
 			}
 
+			if (column.type === "json") {
+				return `
+\t\tconst raw_${field} = getValue(body['${field}']);
+\t\t${requiredCheck}
+\t\tif (raw_${field} !== '') {
+\t\t\ttry {
+\t\t\t\tpayload.${field} = JSON.parse(raw_${field});
+\t\t\t} catch (e) {
+\t\t\t\treturn c.text('${field} must be valid JSON', 400);
+\t\t\t}
+\t\t}
+\t\t`;
+			}
+
 			if (column.type === "date") {
 				return `
 		const raw_${field} = getValue(body['${field}']);

package/cli/templates/dashboard/builders/table-routes/table/index.ts

@@ -31,7 +31,7 @@ export function buildTableRoute(table: DiscoveredTable): string {
 	);
 	const searchConditions = buildSearchConditions(table);
 	const headers = buildColumnHeaders(table, columns);
-	const rowCells = buildRowCells(columns, primaryKey);
+	const rowCells = buildRowCells(table, columns, primaryKey);
 	const createInputs = createColumns
 		.map((columnName) => buildFieldInput(table, columnName, "create"))
 		.join("");

package/cli/templates/handlers/execution.ts

@@ -27,6 +27,8 @@ export function handleOperationError(
 	error: unknown,
 	validationMessage: string,
 ): Response {
+	console.log(error);
+
 	if (error instanceof AppflareHandledError) {
 		return c.json(error.payload, error.status as any);
 	}

package/cli/templates/handlers/generators/types/core.ts

@@ -15,6 +15,8 @@ import {
 	isNotNull,
 	getTableColumns,
 	sql,
+	asc,
+	desc,
 	type InferInsertModel,
 	type InferSelectModel,
 	type SQL,

package/cli/templates/handlers/generators/types/query-runtime/runtime-read.ts

@@ -37,8 +37,8 @@ export function generateQueryRuntimeReadSection(): string {
 							(item: Record<string, unknown>) => {
 								const column = item.column as string;
 								const direction = (item.direction as string) ?? "asc";
-								const col = (table as Record<string, { asc: () => unknown; desc: () => unknown }>)[column];
-								return direction === "desc" ? col.desc() : col.asc();
+								const col = (table as Record<string, any>)[column];
+								return direction === "desc" ? desc(col) : asc(col);
 							},
 						)
 						: undefined;
@@ -114,8 +114,8 @@ export function generateQueryRuntimeReadSection(): string {
 							(item: Record<string, unknown>) => {
 								const column = item.column as string;
 								const direction = (item.direction as string) ?? "asc";
-								const col = (table as Record<string, { asc: () => unknown; desc: () => unknown }>)[column];
-								return direction === "desc" ? col.desc() : col.asc();
+								const col = (table as Record<string, any>)[column];
+								return direction === "desc" ? desc(col) : asc(col);
 							},
 						)
 						: undefined;
@@ -155,3 +155,4 @@ export function generateQueryRuntimeReadSection(): string {
 				},
 `;
 }
+

package/cli/utils/schema-discovery.ts

@@ -5,7 +5,7 @@ import type { LoadedAppflareConfig } from "../types";
 export type DiscoveredColumn = {
 	name: string;
 	expression: string;
-	type: "string" | "number" | "boolean" | "date" | "unknown";
+	type: "string" | "number" | "boolean" | "date" | "json" | "unknown";
 	optional: boolean;
 	primaryKey: boolean;
 	autoIncrement: boolean;
@@ -203,6 +203,9 @@ function inferColumnType(expression: string): DiscoveredColumn["type"] {
 	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";
 	}