appflare 0.2.30 → 0.2.31

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

@@ -1,217 +1,217 @@
-import { DiscoveredTable } from "../../types";
-
-export function buildSearchConditions(table: DiscoveredTable): string {
-	return table.columns
-		.filter((column) => column.type === "string")
-		.map(
-			(column) => `
-\t\t\ttry { searchConditions.push(like(tableSchema.${column.name}, \`%\${search}%\`)); } catch (e) {}
-\t\t\t`,
-		)
-		.join("");
-}
-
-/**
- * Returns an Iconify icon name for a column type.
- */
-function columnTypeIcon(type: string): string {
-	switch (type) {
-		case "number":
-			return "mdi:pound";
-		case "boolean":
-			return "mdi:toggle-switch-outline";
-		case "date":
-			return "mdi:calendar";
-		default:
-			return "mdi:format-text";
-	}
-}
-
-export function buildColumnHeaders(
-	table: DiscoveredTable,
-	columns: string[],
-): string {
-	return columns
-		.map((column) => {
-			const col = table.columns.find((c) => c.name === column);
-			const icon = col ? columnTypeIcon(col.type) : "mdi:format-text";
-			return `
-\t\t\t\t\t\t\t<th>
-\t\t\t\t\t\t\t\t<a href="#" 
-\t\t\t\t\t\t\t\t   hx-get="/admin/table/${table.exportName}?page=\${page}&search=\${search}&sort=${column}&order=\${sort === '${column}' && order === 'asc' ? 'desc' : 'asc'}" 
-\t\t\t\t\t\t\t\t   hx-target="#main-content"
-\t\t\t\t\t\t\t\t   hx-push-url="true"
-\t\t\t\t\t\t\t\t   class="hover:text-primary flex items-center gap-1.5 transition-colors whitespace-nowrap">
-\t\t\t\t\t\t\t\t   <iconify-icon icon="${icon}" width="14" height="14" class="opacity-40"></iconify-icon>
-\t\t\t\t\t\t\t\t   ${column} 
-\t\t\t\t\t\t\t\t   <span class="text-[10px] opacity-30">\${sort === '${column}' ? (order === 'asc' ? '▲' : '▼') : ''}</span>
-\t\t\t\t\t\t\t\t</a>
-\t\t\t\t\t\t\t</th>
-\t\t\t\t\t\t\t`;
-		})
-		.join("");
-}
-
-export function buildRowCells(columns: string[], primaryKey?: string): string {
-	return columns
-		.map((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>`;
-			}
-
-			return `<td><div class="truncate max-w-[200px] text-sm" title="\${String((row as any).${column} ?? '')}">\${String((row as any).${column} ?? '')}</div></td>`;
-		})
-		.join("");
-}
-
-export function buildFieldInput(
-	table: DiscoveredTable,
-	columnName: string,
-	mode: "create" | "edit",
-): string {
-	const column = table.columns.find((item) => item.name === columnName);
-	if (!column) {
-		return "";
-	}
-
-	const requiredAttr = !column.optional ? " required" : "";
-	const inputType =
-		column.type === "number"
-			? "number"
-			: column.type === "date"
-				? "date"
-				: "text";
-
-	if (column.type === "boolean") {
-		if (mode === "edit") {
-			return `
-\t\t<div class="form-control">
-\t\t\t<label class="label cursor-pointer justify-start gap-3">
-\t\t\t\t<input type="checkbox" name="${columnName}" value="true" class="checkbox checkbox-sm checkbox-primary" \${(row as any).${columnName} ? 'checked' : ''} />
-\t\t\t\t<span class="label-text text-sm">${columnName}</span>
-\t\t\t</label>
-\t\t</div>
-\t\t`;
-		}
-
-		return `
-\t\t<div class="form-control">
-\t\t\t<label class="label cursor-pointer justify-start gap-3">
-\t\t\t\t<input type="checkbox" name="${columnName}" value="true" class="checkbox checkbox-sm checkbox-primary" />
-\t\t\t\t<span class="label-text text-sm">${columnName}</span>
-\t\t\t</label>
-\t\t</div>
-\t\t`;
-	}
-
-	if (mode === "edit") {
-		const valueExpression =
-			column.type === "date"
-				? `\${(() => {
-					const value = (row as any).${columnName};
-					if (value == null || value === '') return '';
-
-					const date =
-						value instanceof Date
-							? value
-							: new Date(typeof value === 'number' ? value : String(value));
-					if (Number.isNaN(date.getTime())) return '';
-
-					const year = date.getFullYear();
-					const month = String(date.getMonth() + 1).padStart(2, '0');
-					const day = String(date.getDate()).padStart(2, '0');
-					return String(year) + '-' + month + '-' + day;
-				})()}`
-				: `\${String((row as any).${columnName} ?? '')}`;
-
-		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<input type="${inputType}" name="${columnName}" class="input input-bordered w-full text-sm" value="${valueExpression}"${requiredAttr} />
-\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<input type="${inputType}" name="${columnName}" class="input input-bordered w-full text-sm"${requiredAttr} />
-\t\t</div>
-\t\t`;
-}
-
-export function buildPayloadAssignments(
-	table: DiscoveredTable,
-	fields: string[],
-): string {
-	return fields
-		.map((field) => {
-			const column = table.columns.find((item) => item.name === field);
-			if (!column) {
-				return "";
-			}
-
-			const requiredCheck = !column.optional
-				? `
-\t\tif (raw_${field} === '') {
-\t\t\treturn c.text('${field} is required', 400);
-\t\t}
-\t\t`
-				: "";
-
-			if (column.type === "number") {
-				return `
-\t\tconst raw_${field} = getValue(body['${field}']);
-\t\t${requiredCheck}
-\t\tif (raw_${field} !== '') {
-\t\t\tconst parsed_${field} = Number(raw_${field});
-\t\t\tif (Number.isNaN(parsed_${field})) {
-\t\t\t\treturn c.text('${field} must be a valid number', 400);
-\t\t\t}
-\t\t\tpayload.${field} = parsed_${field};
-\t\t}
-\t\t`;
-			}
-
-			if (column.type === "boolean") {
-				return `
-\t\tconst raw_${field} = getValue(body['${field}']);
-\t\tpayload.${field} = raw_${field} === 'true' || raw_${field} === 'on' || raw_${field} === '1';
-\t\t`;
-			}
-
-			if (column.type === "date") {
-				return `
-		const raw_${field} = getValue(body['${field}']);
-		${requiredCheck}
-		if (raw_${field} !== '') {
-			if (!/^\\d{4}-\\d{2}-\\d{2}$/.test(raw_${field})) {
-				return c.text('${field} must be a valid date (YYYY-MM-DD)', 400);
-			}
-
-			const [year_${field}, month_${field}, day_${field}] = raw_${field}.split('-').map(Number);
-			const parsed_${field} = new Date(year_${field}, month_${field} - 1, day_${field});
-			if (
-				Number.isNaN(parsed_${field}.getTime()) ||
-				parsed_${field}.getFullYear() !== year_${field} ||
-				parsed_${field}.getMonth() !== month_${field} - 1 ||
-				parsed_${field}.getDate() !== day_${field}
-			) {
-				return c.text('${field} must be a valid date', 400);
-			}
-
-			payload.${field} = parsed_${field};
-		}
-		`;
-			}
-
-			return `
-\t\tconst raw_${field} = getValue(body['${field}']);
-\t\t${requiredCheck}
-\t\tif (raw_${field} !== '') {
-\t\t\tpayload.${field} = raw_${field};
-\t\t}
-\t\t`;
-		})
-		.join("\n");
-}
+import { DiscoveredTable } from "../../types";
+
+export function buildSearchConditions(table: DiscoveredTable): string {
+	return table.columns
+		.filter((column) => column.type === "string")
+		.map(
+			(column) => `
+\t\t\ttry { searchConditions.push(like(tableSchema.${column.name}, \`%\${search}%\`)); } catch (e) {}
+\t\t\t`,
+		)
+		.join("");
+}
+
+/**
+ * Returns an Iconify icon name for a column type.
+ */
+function columnTypeIcon(type: string): string {
+	switch (type) {
+		case "number":
+			return "mdi:pound";
+		case "boolean":
+			return "mdi:toggle-switch-outline";
+		case "date":
+			return "mdi:calendar";
+		default:
+			return "mdi:format-text";
+	}
+}
+
+export function buildColumnHeaders(
+	table: DiscoveredTable,
+	columns: string[],
+): string {
+	return columns
+		.map((column) => {
+			const col = table.columns.find((c) => c.name === column);
+			const icon = col ? columnTypeIcon(col.type) : "mdi:format-text";
+			return `
+\t\t\t\t\t\t\t<th>
+\t\t\t\t\t\t\t\t<a href="#" 
+\t\t\t\t\t\t\t\t   hx-get="/admin/table/${table.exportName}?page=\${page}&search=\${search}&sort=${column}&order=\${sort === '${column}' && order === 'asc' ? 'desc' : 'asc'}" 
+\t\t\t\t\t\t\t\t   hx-target="#main-content"
+\t\t\t\t\t\t\t\t   hx-push-url="true"
+\t\t\t\t\t\t\t\t   class="hover:text-primary flex items-center gap-1.5 transition-colors whitespace-nowrap">
+\t\t\t\t\t\t\t\t   <iconify-icon icon="${icon}" width="14" height="14" class="opacity-40"></iconify-icon>
+\t\t\t\t\t\t\t\t   ${column} 
+\t\t\t\t\t\t\t\t   <span class="text-[10px] opacity-30">\${sort === '${column}' ? (order === 'asc' ? '▲' : '▼') : ''}</span>
+\t\t\t\t\t\t\t\t</a>
+\t\t\t\t\t\t\t</th>
+\t\t\t\t\t\t\t`;
+		})
+		.join("");
+}
+
+export function buildRowCells(columns: string[], primaryKey?: string): string {
+	return columns
+		.map((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>`;
+			}
+
+			return `<td><div class="truncate max-w-[200px] text-sm" title="\${String((row as any).${column} ?? '')}">\${String((row as any).${column} ?? '')}</div></td>`;
+		})
+		.join("");
+}
+
+export function buildFieldInput(
+	table: DiscoveredTable,
+	columnName: string,
+	mode: "create" | "edit",
+): string {
+	const column = table.columns.find((item) => item.name === columnName);
+	if (!column) {
+		return "";
+	}
+
+	const requiredAttr = !column.optional ? " required" : "";
+	const inputType =
+		column.type === "number"
+			? "number"
+			: column.type === "date"
+				? "date"
+				: "text";
+
+	if (column.type === "boolean") {
+		if (mode === "edit") {
+			return `
+\t\t<div class="form-control">
+\t\t\t<label class="label cursor-pointer justify-start gap-3">
+\t\t\t\t<input type="checkbox" name="${columnName}" value="true" class="checkbox checkbox-sm checkbox-primary" \${(row as any).${columnName} ? 'checked' : ''} />
+\t\t\t\t<span class="label-text text-sm">${columnName}</span>
+\t\t\t</label>
+\t\t</div>
+\t\t`;
+		}
+
+		return `
+\t\t<div class="form-control">
+\t\t\t<label class="label cursor-pointer justify-start gap-3">
+\t\t\t\t<input type="checkbox" name="${columnName}" value="true" class="checkbox checkbox-sm checkbox-primary" />
+\t\t\t\t<span class="label-text text-sm">${columnName}</span>
+\t\t\t</label>
+\t\t</div>
+\t\t`;
+	}
+
+	if (mode === "edit") {
+		const valueExpression =
+			column.type === "date"
+				? `\${(() => {
+					const value = (row as any).${columnName};
+					if (value == null || value === '') return '';
+
+					const date =
+						value instanceof Date
+							? value
+							: new Date(typeof value === 'number' ? value : String(value));
+					if (Number.isNaN(date.getTime())) return '';
+
+					const year = date.getFullYear();
+					const month = String(date.getMonth() + 1).padStart(2, '0');
+					const day = String(date.getDate()).padStart(2, '0');
+					return String(year) + '-' + month + '-' + day;
+				})()}`
+				: `\${String((row as any).${columnName} ?? '')}`;
+
+		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<input type="${inputType}" name="${columnName}" class="input input-bordered w-full text-sm" value="${valueExpression}"${requiredAttr} />
+\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<input type="${inputType}" name="${columnName}" class="input input-bordered w-full text-sm"${requiredAttr} />
+\t\t</div>
+\t\t`;
+}
+
+export function buildPayloadAssignments(
+	table: DiscoveredTable,
+	fields: string[],
+): string {
+	return fields
+		.map((field) => {
+			const column = table.columns.find((item) => item.name === field);
+			if (!column) {
+				return "";
+			}
+
+			const requiredCheck = !column.optional
+				? `
+\t\tif (raw_${field} === '') {
+\t\t\treturn c.text('${field} is required', 400);
+\t\t}
+\t\t`
+				: "";
+
+			if (column.type === "number") {
+				return `
+\t\tconst raw_${field} = getValue(body['${field}']);
+\t\t${requiredCheck}
+\t\tif (raw_${field} !== '') {
+\t\t\tconst parsed_${field} = Number(raw_${field});
+\t\t\tif (Number.isNaN(parsed_${field})) {
+\t\t\t\treturn c.text('${field} must be a valid number', 400);
+\t\t\t}
+\t\t\tpayload.${field} = parsed_${field};
+\t\t}
+\t\t`;
+			}
+
+			if (column.type === "boolean") {
+				return `
+\t\tconst raw_${field} = getValue(body['${field}']);
+\t\tpayload.${field} = raw_${field} === 'true' || raw_${field} === 'on' || raw_${field} === '1';
+\t\t`;
+			}
+
+			if (column.type === "date") {
+				return `
+		const raw_${field} = getValue(body['${field}']);
+		${requiredCheck}
+		if (raw_${field} !== '') {
+			if (!/^\\d{4}-\\d{2}-\\d{2}$/.test(raw_${field})) {
+				return c.text('${field} must be a valid date (YYYY-MM-DD)', 400);
+			}
+
+			const [year_${field}, month_${field}, day_${field}] = raw_${field}.split('-').map(Number);
+			const parsed_${field} = new Date(year_${field}, month_${field} - 1, day_${field});
+			if (
+				Number.isNaN(parsed_${field}.getTime()) ||
+				parsed_${field}.getFullYear() !== year_${field} ||
+				parsed_${field}.getMonth() !== month_${field} - 1 ||
+				parsed_${field}.getDate() !== day_${field}
+			) {
+				return c.text('${field} must be a valid date', 400);
+			}
+
+			payload.${field} = parsed_${field};
+		}
+		`;
+			}
+
+			return `
+\t\tconst raw_${field} = getValue(body['${field}']);
+\t\t${requiredCheck}
+\t\tif (raw_${field} !== '') {
+\t\t\tpayload.${field} = raw_${field};
+\t\t}
+\t\t`;
+		})
+		.join("\n");
+}

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

@@ -1,45 +1,45 @@
-import { DiscoveredTable } from "../../types";
-
-export function resolvePrimaryKey(table: DiscoveredTable): string {
-	return (
-		table.columns.find((column) => column.primaryKey)?.name ||
-		table.columns[0]?.name ||
-		""
-	);
-}
-
-export function shouldIncludeCreateField(
-	table: DiscoveredTable,
-	columnName: string,
-): boolean {
-	const column = table.columns.find((item) => item.name === columnName);
-	if (!column) {
-		return false;
-	}
-
-	if (column.autoIncrement) {
-		return false;
-	}
-
-	if (column.primaryKey) {
-		return false;
-	}
-
-	return true;
-}
-
-export function shouldIncludeEditField(
-	table: DiscoveredTable,
-	columnName: string,
-): boolean {
-	const column = table.columns.find((item) => item.name === columnName);
-	if (!column) {
-		return false;
-	}
-
-	if (column.primaryKey || column.autoIncrement) {
-		return false;
-	}
-
-	return true;
-}
+import { DiscoveredTable } from "../../types";
+
+export function resolvePrimaryKey(table: DiscoveredTable): string {
+	return (
+		table.columns.find((column) => column.primaryKey)?.name ||
+		table.columns[0]?.name ||
+		""
+	);
+}
+
+export function shouldIncludeCreateField(
+	table: DiscoveredTable,
+	columnName: string,
+): boolean {
+	const column = table.columns.find((item) => item.name === columnName);
+	if (!column) {
+		return false;
+	}
+
+	if (column.autoIncrement) {
+		return false;
+	}
+
+	if (column.primaryKey) {
+		return false;
+	}
+
+	return true;
+}
+
+export function shouldIncludeEditField(
+	table: DiscoveredTable,
+	columnName: string,
+): boolean {
+	const column = table.columns.find((item) => item.name === columnName);
+	if (!column) {
+		return false;
+	}
+
+	if (column.primaryKey || column.autoIncrement) {
+		return false;
+	}
+
+	return true;
+}

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

@@ -1,8 +1,8 @@
-import { DiscoveredSchema } from "../../../../utils/schema-discovery";
-import { buildTableRoute } from "./table-route";
-import { buildUsersRoute } from "./users-route";
-
-export function buildTableRoutes(schema: DiscoveredSchema): string {
-	return `${schema.tables.map((table) => buildTableRoute(table)).join("\n")}
-${buildUsersRoute()}`;
-}
+import { DiscoveredSchema } from "../../../../utils/schema-discovery";
+import { buildTableRoute } from "./table-route";
+import { buildUsersRoute } from "./users-route";
+
+export function buildTableRoutes(schema: DiscoveredSchema): string {
+	return `${schema.tables.map((table) => buildTableRoute(table)).join("\n")}
+${buildUsersRoute()}`;
+}