@sealcode/sealgen 0.10.4 → 0.10.6

package/@types/page/list.d.ts

@@ -12,6 +12,10 @@ export declare const BaseListPageFields: {
     readonly itemsPerPage: NumberField<12, false>;
     readonly sort: SimpleFormField<false>;
 };
+export type ListSort = {
+    field: string;
+    order: "asc" | "desc";
+};
 export declare abstract class ListPage<ItemType, F extends typeof BaseListPageFields> extends Page<F> {
     abstract getItems(ctx: Context, page: number, itemsPerPage: number, values: Record<string, FormDataValue>): Promise<ItemType[]>;
     abstract getTotalPages(ctx: Context, itemsPerPage: number, values: Record<string, FormDataValue>): Promise<number>;
@@ -29,13 +33,11 @@ export declare abstract class ListPage<ItemType, F extends typeof BaseListPageFi
     renderPagination(ctx: Context, values: Record<string, FormDataValue>): Promise<FlatTemplatable>;
     private renderPageButton;
     getFilterValues(ctx: Context): Promise<Record<string, unknown>>;
-    getSort(ctx: Context): Promise<{
-        field: string;
-        order: "asc" | "desc";
-    } | null>;
+    getSort(ctx: Context): Promise<ListSort | null>;
     makeSortLink(ctx: Context, field: string, order: "asc" | "desc"): string;
     renderFilters(ctx: Context): Promise<FlatTemplatable>;
     renderHeading(ctx: Context, field: string, label?: string): Promise<FlatTemplatable>;
+    getDefaultSort(_: Context): ListSort | null;
     renderTableHead(ctx: Context, fields: {
         field: string;
         label?: string;

package/@types/page/sealious-list.d.ts

@@ -10,6 +10,7 @@ export declare abstract class SealiousItemListPage<C extends Collection, F exten
     protected addFilter(ctx: Context, list: ItemList<C>): Promise<void>;
     makeQuery(ctx: Context): Promise<ItemList<C>>;
     getItems(ctx: Context, page: number, itemsPerPage: number): Promise<CollectionItem<C>[]>;
+    getFilterValues(ctx: Context): Promise<Record<string, string | undefined>>;
     renderItem(_: Context, item: CollectionItem<C>, index: number): Promise<FlatTemplatable>;
     canAccess: (ctx: Context) => Promise<{
         canAccess: boolean;

package/lib/page/list.js

@@ -135,7 +135,13 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
     }
     async getSort(ctx) {
         const { sort } = await this.extractRawValues(ctx);
-        return decodeSort(sort);
+        const decoded = decodeSort(sort);
+        if (decoded === null) {
+            return this.getDefaultSort(ctx);
+        }
+        else {
+            return decoded;
+        }
     }
     makeSortLink(ctx, field, order) {
         const url = new URL(ctx.url, "https://example.com");
@@ -169,6 +175,9 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 			>
 		</th>`;
     }
+    getDefaultSort(_) {
+        return null;
+    }
     renderTableHead(ctx, fields) {
         return (0, tempstream_1.tempstream /* HTML */) `<thead>
 			<tr>

package/lib/page/sealious-list.js

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SealiousItemListPage = void 0;
 const list_1 = require("./list");
 const access_control_1 = require("./access-control");
+const qs_1 = __importDefault(require("qs"));
+const ts_predicates_1 = require("@sealcode/ts-predicates");
 class SealiousItemListPage extends list_1.ListPage {
     constructor(collection) {
         super();
@@ -45,6 +50,14 @@ class SealiousItemListPage extends list_1.ListPage {
             .fetch();
         return items;
     }
+    async getFilterValues(ctx) {
+        const query_params = qs_1.default.parse(ctx.search.slice(1));
+        const _filter_values = query_params?.filter || {};
+        let filter_values = (0, ts_predicates_1.is)(_filter_values, ts_predicates_1.predicates.record(ts_predicates_1.predicates.string, ts_predicates_1.predicates.string))
+            ? _filter_values
+            : {};
+        return filter_values;
+    }
     async renderItem(_, item, index) {
         return `<div>${item.id}</div>`;
     }

package/lib/templates/list.js

@@ -33,7 +33,12 @@ import { CollectionItem, Field } from "sealious";
 import { FlatTemplatable, tempstream } from "tempstream";
 import { ${uppercase_collection} } from "${rel("src/back/collections/collections.js")}";
 import html from "${rel("src/back/html.js")}";
-import { SealiousItemListPage, BaseListPageFields, DefaultListFilters } from "@sealcode/sealgen";
+import {
+	SealiousItemListPage,
+	BaseListPageFields,
+	DefaultListFilters,
+    ListFilterRender,
+} from "@sealcode/sealgen";;
 import qs from "qs";
 import { is, predicates } from "@sealcode/ts-predicates";
 
@@ -47,7 +52,7 @@ ${collection_fields
         .join(",\n")}
 ] as {
 	field: keyof (typeof PatronEvents)["fields"];
-	render?: (value: string, field: Field) => string;
+	render?: ListFilterRender;
 }[];
 
 const displayFields = [
@@ -64,7 +69,11 @@ ${collection_fields
             return `	{
 		field: "${field.name}",
 		label: "${field.name}",
-		format: (v: number) => {const d = new Date(); d.setTime(v); return d.toString();},
+		format: (v: number) => {
+			const d = new Date();
+			d.setTime(v);
+			return d.toString().split(" ").slice(1, 5).join(" ");
+		},
 	}`;
         }
         return `	{ field: "${field.name}", label: "${field.name}" }`;
@@ -78,22 +87,6 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 > {
 	fields = BaseListPageFields;
 
-	async render(ctx: Context) {
-		return html(
-			ctx,
-			"${action_name}",
-			tempstream/* HTML */ \`<div>
-				<h2>${action_name}</h2>
-				<table class="sealious-list">
-					\${this.renderTableHead(ctx, displayFields)}
-					<tbody>
-						\${super.render(ctx)}
-					</tbody>
-				</table>
-			</div>\`
-		);
-	}
-
 	async renderFilters(ctx: Context): Promise<FlatTemplatable> {
 		const query_params = qs.parse(ctx.search.slice(1));
 		query_params.page = "1";
@@ -109,34 +102,20 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 					value="\${value}"
 				/>\`;
 			})}
-			\${filterFields.map((field_name) => {
-				const filter =
-					FieldToFilter[this.collection.fields[field_name].typeName] ||
-					FieldToFilter.boolean;
+			\${filterFields.map(({ field, render }) => {
+				if (!render) {
+					render = DefaultListFilters.fallback;
+				}
 
 				return (
-					filter?.render(
-						filter_values[field_name] || "",
-						this.collection.fields[field_name]
-					) || ""
+					render(filter_values[field] || "", this.collection.fields[field]) ||
+					""
 				);
 			})}
 			<input type="submit" />
 		</form>\`;
 	}
 
-	async getFilterValues(ctx: Context) {
-		const query_params = qs.parse(ctx.search.slice(1));
-		const _filter_values = query_params?.filter || {};
-		let filter_values: Record<string, string | undefined> = is(
-			_filter_values,
-			predicates.record(predicates.string, predicates.string)
-		)
-			? _filter_values
-			: {};
-		return filter_values;
-	}
-
 	async renderItem(_: Context, item: CollectionItem<typeof ${uppercase_collection}>) {
 		return tempstream/* HTML */ \`<tr>
 			\${displayFields.map(({ field, format }) => {
@@ -145,6 +124,23 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 			})}
 		</tr>\`;
 	}
+
+	async render(ctx: Context) {
+		return html(
+			ctx,
+			"${action_name}",
+			tempstream/* HTML */ \`<div>
+				<h2>${action_name}</h2>
+				<table class="sealious-list">
+					\${this.renderTableHead(ctx, displayFields)}
+					<tbody>
+						\${super.render(ctx)}
+					</tbody>
+				</table>
+			</div>\`
+		);
+	}
+
 })(${uppercase_collection});
 `;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.10.4",
+	"version": "0.10.6",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"scripts": {

package/src/page/list.ts

@@ -18,10 +18,10 @@ export const BaseListPageFields = <const>{
 	sort: new SimpleFormField(false),
 };
 
+export type ListSort = { field: string; order: "asc" | "desc" };
+
 const SORT_SEPARATOR = ":";
-function decodeSort(
-	s: unknown
-): { field: string; order: "asc" | "desc" } | null {
+function decodeSort(s: unknown): ListSort | null {
 	if (typeof s !== "string" || !s.includes(SORT_SEPARATOR)) {
 		return null;
 	}
@@ -38,7 +38,7 @@ function decodeSort(
 	}
 }
 
-function encodeSort(field: string, order: "asc" | "desc") {
+function encodeSort(field: string, order: "asc" | "desc"): string {
 	return [field, order].join(SORT_SEPARATOR);
 }
 
@@ -185,11 +185,14 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 		return filter;
 	}
 
-	async getSort(
-		ctx: Context
-	): Promise<{ field: string; order: "asc" | "desc" } | null> {
+	async getSort(ctx: Context): Promise<ListSort | null> {
 		const { sort } = await this.extractRawValues(ctx);
-		return decodeSort(sort);
+		const decoded = decodeSort(sort);
+		if (decoded === null) {
+			return this.getDefaultSort(ctx);
+		} else {
+			return decoded;
+		}
 	}
 
 	makeSortLink(ctx: Context, field: string, order: "asc" | "desc"): string {
@@ -238,6 +241,10 @@ ${this.renderListContainer(ctx, this.renderItems(ctx, values))}`;
 		</th>`;
 	}
 
+	getDefaultSort(_: Context): ListSort | null {
+		return null;
+	}
+
 	renderTableHead(
 		ctx: Context,
 		fields: { field: string; label?: string }[]

package/src/page/sealious-list.ts

@@ -9,6 +9,8 @@ import {
 } from "sealious";
 import { FlatTemplatable } from "tempstream";
 import { peopleWhoCan } from "./access-control";
+import qs from "qs";
+import { is, predicates } from "@sealcode/ts-predicates";
 
 export abstract class SealiousItemListPage<
 	C extends Collection,
@@ -64,6 +66,18 @@ export abstract class SealiousItemListPage<
 		return items;
 	}
 
+	async getFilterValues(ctx: Context) {
+		const query_params = qs.parse(ctx.search.slice(1));
+		const _filter_values = query_params?.filter || {};
+		let filter_values: Record<string, string | undefined> = is(
+			_filter_values,
+			predicates.record(predicates.string, predicates.string)
+		)
+			? _filter_values
+			: {};
+		return filter_values;
+	}
+
 	async renderItem(
 		_: Context,
 		item: CollectionItem<C>,

package/src/templates/list.ts

@@ -39,7 +39,12 @@ import { ${uppercase_collection} } from "${rel(
 		"src/back/collections/collections.js"
 	)}";
 import html from "${rel("src/back/html.js")}";
-import { SealiousItemListPage, BaseListPageFields, DefaultListFilters } from "@sealcode/sealgen";
+import {
+	SealiousItemListPage,
+	BaseListPageFields,
+	DefaultListFilters,
+    ListFilterRender,
+} from "@sealcode/sealgen";;
 import qs from "qs";
 import { is, predicates } from "@sealcode/ts-predicates";
 
@@ -58,7 +63,7 @@ ${collection_fields
 	.join(",\n")}
 ] as {
 	field: keyof (typeof PatronEvents)["fields"];
-	render?: (value: string, field: Field) => string;
+	render?: ListFilterRender;
 }[];
 
 const displayFields = [
@@ -75,7 +80,11 @@ ${collection_fields
 			return `	{
 		field: "${field.name}",
 		label: "${field.name}",
-		format: (v: number) => {const d = new Date(); d.setTime(v); return d.toString();},
+		format: (v: number) => {
+			const d = new Date();
+			d.setTime(v);
+			return d.toString().split(" ").slice(1, 5).join(" ");
+		},
 	}`;
 		}
 		return `	{ field: "${field.name}", label: "${field.name}" }`;
@@ -89,22 +98,6 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 > {
 	fields = BaseListPageFields;
 
-	async render(ctx: Context) {
-		return html(
-			ctx,
-			"${action_name}",
-			tempstream/* HTML */ \`<div>
-				<h2>${action_name}</h2>
-				<table class="sealious-list">
-					\${this.renderTableHead(ctx, displayFields)}
-					<tbody>
-						\${super.render(ctx)}
-					</tbody>
-				</table>
-			</div>\`
-		);
-	}
-
 	async renderFilters(ctx: Context): Promise<FlatTemplatable> {
 		const query_params = qs.parse(ctx.search.slice(1));
 		query_params.page = "1";
@@ -120,34 +113,20 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 					value="\${value}"
 				/>\`;
 			})}
-			\${filterFields.map((field_name) => {
-				const filter =
-					FieldToFilter[this.collection.fields[field_name].typeName] ||
-					FieldToFilter.boolean;
+			\${filterFields.map(({ field, render }) => {
+				if (!render) {
+					render = DefaultListFilters.fallback;
+				}
 
 				return (
-					filter?.render(
-						filter_values[field_name] || "",
-						this.collection.fields[field_name]
-					) || ""
+					render(filter_values[field] || "", this.collection.fields[field]) ||
+					""
 				);
 			})}
 			<input type="submit" />
 		</form>\`;
 	}
 
-	async getFilterValues(ctx: Context) {
-		const query_params = qs.parse(ctx.search.slice(1));
-		const _filter_values = query_params?.filter || {};
-		let filter_values: Record<string, string | undefined> = is(
-			_filter_values,
-			predicates.record(predicates.string, predicates.string)
-		)
-			? _filter_values
-			: {};
-		return filter_values;
-	}
-
 	async renderItem(_: Context, item: CollectionItem<typeof ${uppercase_collection}>) {
 		return tempstream/* HTML */ \`<tr>
 			\${displayFields.map(({ field, format }) => {
@@ -156,6 +135,23 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 			})}
 		</tr>\`;
 	}
+
+	async render(ctx: Context) {
+		return html(
+			ctx,
+			"${action_name}",
+			tempstream/* HTML */ \`<div>
+				<h2>${action_name}</h2>
+				<table class="sealious-list">
+					\${this.renderTableHead(ctx, displayFields)}
+					<tbody>
+						\${super.render(ctx)}
+					</tbody>
+				</table>
+			</div>\`
+		);
+	}
+
 })(${uppercase_collection});
 `;
 };