@sealcode/sealgen 0.4.2 → 0.5.2

package/src/page/list.ts

@@ -1,4 +1,4 @@
-import { BaseContext } from "koa";
+import { Context } from "koa";
 import { Collection, CollectionItem, ItemFields, ItemList } from "sealious";
 
 import { Templatable, tempstream, FlatTemplatable } from "tempstream";
@@ -24,22 +24,19 @@ export abstract class ListPage<
 	F extends typeof BaseListPageFields
 > extends Page<F> {
 	abstract getItems(
-		ctx: BaseContext,
+		ctx: Context,
 		page: number,
 		itemsPerPage: number,
 		values: Record<string, FormDataValue>
 	): Promise<ItemType[]>;
 
 	abstract getTotalPages(
-		ctx: BaseContext,
+		ctx: Context,
 		itemsPerPage: number,
 		values: Record<string, FormDataValue>
 	): Promise<number>;
 
-	abstract renderItem(
-		ctx: BaseContext,
-		item: ItemType
-	): Promise<FlatTemplatable>;
+	abstract renderItem(ctx: Context, item: ItemType): Promise<FlatTemplatable>;
 
 	filterFields: Record<string, FormField> = {};
 	filterControls: FormFieldControl[] = [];
@@ -51,11 +48,11 @@ export abstract class ListPage<
 		}
 	}
 
-	renderListContainer(_: BaseContext, content: Templatable): FlatTemplatable {
+	renderListContainer(_: Context, content: Templatable): FlatTemplatable {
 		return tempstream`<div>${content}</div>`;
 	}
 
-	async render(ctx: BaseContext): Promise<FlatTemplatable> {
+	async render(ctx: Context): Promise<FlatTemplatable> {
 		const values = this.extractRawValues(ctx);
 		const { parsed: page } = await this.fields.page.getValue(ctx, values);
 		const { parsed: itemsPerPage } =
@@ -73,7 +70,7 @@ export abstract class ListPage<
 	}
 
 	async renderPagination(
-		ctx: BaseContext,
+		ctx: Context,
 		values: Record<string, FormDataValue>
 	): Promise<FlatTemplatable> {
 		const { parsed: page } = await this.fields.page.getValue(ctx, values);
@@ -112,7 +109,7 @@ export abstract class ListPage<
 		</center>`;
 	}
 
-	private renderPageButton(ctx: BaseContext, page: number, text: string) {
+	private renderPageButton(ctx: Context, page: number, text: string) {
 		return /* HTML */ `<a
 			href="${UrlWithNewParams(
 				ctx,
@@ -125,7 +122,7 @@ export abstract class ListPage<
 		>`;
 	}
 
-	async getFilterValues(ctx: BaseContext): Promise<Record<string, unknown>> {
+	async getFilterValues(ctx: Context): Promise<Record<string, unknown>> {
 		const filter = {} as Record<string, unknown>;
 		const raw_values = this.extractRawValues(ctx);
 		for (const [fieldname, field] of Object.entries(this.filterFields)) {
@@ -136,7 +133,7 @@ export abstract class ListPage<
 		return filter;
 	}
 
-	renderFilters(ctx: BaseContext): FlatTemplatable {
+	renderFilters(ctx: Context): FlatTemplatable {
 		const values = this.extractRawValues(ctx);
 		return tempstream/* HTML */ `<form method="GET">
 			${makeHiddenInputs(ctx, this.fields, values, [
@@ -159,20 +156,14 @@ export abstract class SealiousItemListPage<
 		super();
 	}
 
-	async getTotalPages(
-		ctx: BaseContext,
-		itemsPerPage: number
-	): Promise<number> {
+	async getTotalPages(ctx: Context, itemsPerPage: number): Promise<number> {
 		const query = this.collection.list(ctx.$context);
 		await this.addFilter(ctx, query);
 		const { items } = await query.fetch();
 		return Math.ceil(items.length / itemsPerPage);
 	}
 
-	protected async addFilter(
-		ctx: BaseContext,
-		list: ItemList<C>
-	): Promise<void> {
+	protected async addFilter(ctx: Context, list: ItemList<C>): Promise<void> {
 		const filters = await this.getFilterValues(ctx);
 		if (Object.keys(filters).length) {
 			list.filter(filters as Partial<ItemFields<C>>);
@@ -180,7 +171,7 @@ export abstract class SealiousItemListPage<
 	}
 
 	async getItems(
-		ctx: BaseContext,
+		ctx: Context,
 		page: number,
 		itemsPerPage: number
 	): Promise<CollectionItem<C>[]> {
@@ -193,7 +184,7 @@ export abstract class SealiousItemListPage<
 	}
 
 	async renderItem(
-		_: BaseContext,
+		_: Context,
 		item: CollectionItem<C>
 	): Promise<FlatTemplatable> {
 		return `<div>${item.id}</div>`;

package/src/page/mountable.ts

@@ -1,7 +1,7 @@
 import Router from "@koa/router";
 import { FormControl } from "../forms/controls/form-control";
-import { BaseContext } from "koa";
-import { FlatTemplatable, Templatable, tempstream } from "tempstream";
+import { Context } from "koa";
+import { FlatTemplatable, tempstream } from "tempstream";
 import { FormField } from "../forms/fields/field";
 import { FormData, FormDataValue, FormMessage } from "../forms/form";
 
@@ -20,19 +20,19 @@ export abstract class Mountable<F extends Fields = Fields> {
 	abstract mount(router: Router, path: string): void;
 
 	abstract canAccess(
-		ctx: BaseContext
+		ctx: Context
 	): Promise<{ canAccess: boolean; message: string }>;
 
 	abstract renderError(
-		ctx: BaseContext,
+		ctx: Context,
 		error: PageErrorMessage
 	): Promise<FlatTemplatable>;
 
-	abstract extractRawValues(ctx: BaseContext): Record<string, FormDataValue>;
+	abstract extractRawValues(ctx: Context): Record<string, FormDataValue>;
 
 	// this one is meant to be overwritten
 	async validateValues(
-		ctx: BaseContext,
+		ctx: Context,
 		data: Record<string, FormDataValue>
 	): Promise<{ valid: boolean; error: string }> {
 		return {
@@ -42,7 +42,7 @@ export abstract class Mountable<F extends Fields = Fields> {
 	}
 
 	protected async validate(
-		ctx: BaseContext,
+		ctx: Context,
 		values: Record<string, FormDataValue>
 	): Promise<{
 		valid: boolean;
@@ -83,7 +83,7 @@ export abstract class Mountable<F extends Fields = Fields> {
 	}
 
 	public renderControls(
-		ctx: BaseContext,
+		ctx: Context,
 		data: FormData<keyof Fields>
 	): FlatTemplatable {
 		return tempstream/* HTML */ `${this.controls.map((control) =>
@@ -92,7 +92,7 @@ export abstract class Mountable<F extends Fields = Fields> {
 	}
 
 	public renderMessages(
-		_: BaseContext,
+		_: Context,
 		data: FormData<keyof Fields>
 	): FlatTemplatable {
 		return tempstream/* HTML */ `<div class="form-messages">

package/src/page/page.ts

@@ -1,5 +1,5 @@
 import Router from "@koa/router";
-import { BaseContext } from "koa";
+import { Context } from "koa";
 
 import { FlatTemplatable, Templatable, tempstream } from "tempstream";
 import { AllQueryParams } from "..";
@@ -21,20 +21,20 @@ export abstract class Page<
 	}
 
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	async canAccess(_: BaseContext) {
+	async canAccess(_: Context) {
 		return { canAccess: true, message: "" };
 	}
 
 	async renderError(
-		_: BaseContext,
+		_: Context,
 		error: PageErrorMessage
 	): Promise<FlatTemplatable> {
 		return tempstream/* HTML */ `<div>${error.message}</div>`;
 	}
 
-	public abstract render(ctx: BaseContext): Promise<FlatTemplatable>;
+	public abstract render(ctx: Context): Promise<FlatTemplatable>;
 
-	extractRawValues(ctx: BaseContext): Record<string, FormDataValue> {
+	extractRawValues(ctx: Context): Record<string, FormDataValue> {
 		return this.propsParser.decode(ctx);
 	}
 }

package/src/page/props-parser.ts

@@ -1,4 +1,4 @@
-import { BaseContext } from "koa";
+import { Context } from "koa";
 import merge from "merge";
 import { FormData, FormDataValue } from "..";
 import { BasePageProps } from "./list";
@@ -10,14 +10,11 @@ export type EncodedProps = Record<string, unknown>;
 // or any other exotic types is done by fields logic.
 
 export abstract class PagePropsParser<PropsType> {
-	abstract decode(ctx: BaseContext): Record<string, FormDataValue>;
+	abstract decode(ctx: Context): Record<string, FormDataValue>;
 	abstract encode(props: Record<string, FormData>): EncodedProps;
 	abstract getHTMLInputName(prop_name: string): string;
 
-	overwriteProp(
-		ctx: BaseContext,
-		new_props: Partial<PropsType>
-	): EncodedProps {
+	overwriteProp(ctx: Context, new_props: Partial<PropsType>): EncodedProps {
 		const result = {};
 		merge.recursive(result, this.decode(ctx), new_props);
 		return result;
@@ -27,7 +24,7 @@ export abstract class PagePropsParser<PropsType> {
 export class AllQueryParams<
 	PropsType extends BasePageProps
 > extends PagePropsParser<PropsType> {
-	decode(ctx: BaseContext): Record<string, FormDataValue> {
+	decode(ctx: Context): Record<string, FormDataValue> {
 		return ctx.query;
 	}
 

package/src/templates/form.ts

@@ -5,23 +5,16 @@ export async function formTemplate(
 	newfilefullpath: string
 ): Promise<string> {
 	const rel = curryImportPath(newfilefullpath);
-	return `import { BaseContext } from "koa";
-import {
-	CollectionField,
-	Form,
-	FormData,
-	FormDataValue,
-	SimpleFormField,
-	SimpleInput,
-} from "@sealcode/sealgen";
+	return `import { Context } from "koa";
+import { Form, FormData, FormDataValue, Fields, Controls } from "@sealcode/sealgen";
 import html from "../html";
 import { Users } from "${rel("src/back/collections/collections")}";
 
 export const actionName = "${action_name}";
 
 const fields = {
-	email: new CollectionField(true, Users.fields.email),
-	password: new SimpleFormField(true),
+	email: new Fields.CollectionField(true, Users.fields.email),
+	password: new Fields.SimpleFormField(true),
 };
 
 export default new (class ${action_name}Form extends Form<typeof fields> {
@@ -29,12 +22,12 @@ export default new (class ${action_name}Form extends Form<typeof fields> {
 	fields = fields;
 
 	controls = [
-		new SimpleInput(fields.email, { label: "Email:", type: "email" }),
-		new SimpleInput(fields.password, { label: "Password:", type: "password" }),
+		new Controls.SimpleInput(fields.email, { label: "Email:", type: "email" }),
+		new Controls.SimpleInput(fields.password, { label: "Password:", type: "password" }),
 	];
 
 	async validateValues(
-		ctx: BaseContext,
+		ctx: Context,
 		data: Record<string, FormDataValue>
 	): Promise<{ valid: boolean; error: string }> {
 		// just an example
@@ -48,7 +41,7 @@ export default new (class ${action_name}Form extends Form<typeof fields> {
 	}
 
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	async canAccess(_: BaseContext) {
+	async canAccess(_: Context) {
 		return { canAccess: true, message: "" };
 	}
 
@@ -57,7 +50,7 @@ export default new (class ${action_name}Form extends Form<typeof fields> {
 		return;
 	}
 
-	async render(ctx: BaseContext, data: FormData) {
+	async render(ctx: Context, data: FormData) {
 		return html(ctx, "${action_name}", await super.render(ctx, data));
 	}
 })();

package/src/templates/list.ts

@@ -21,13 +21,13 @@ export const listTemplate = async (
 	const uppercase_collection =
 		collection[0].toLocaleUpperCase() + collection.slice(1);
 	const rel = curryImportPath(newfilefullpath);
-	return `import { BaseContext } from "koa";
+	return `import { Context } from "koa";
 import { CollectionItem } from "sealious";
 import { tempstream } from "tempstream";
 import { ${uppercase_collection} } from "${rel(
 		"src/back/collections/collections"
 	)}";
-import html from "../../html";
+import { ${uppercase_collection} } from "${rel("src/back/html.ts")}";
 import { SealiousItemListPage, BaseListPageFields } from "@sealcode/sealgen";
 
 export const actionName = "${action_name}";
@@ -43,7 +43,7 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 	filterFields = filterFields;
 	filterControls = [];
 
-	async render(ctx: BaseContext) {
+	async render(ctx: Context) {
 		return html(
 			ctx,
 			"${uppercase_collection}",
@@ -64,7 +64,7 @@ export default new (class ${action_name}Page extends SealiousItemListPage<
 		);
 	}
 
-	async renderItem(_: BaseContext, item: CollectionItem<typeof ${uppercase_collection}>) {
+	async renderItem(_: Context, item: CollectionItem<typeof ${uppercase_collection}>) {
 		return tempstream\`<tr><td>\${item.id}</td>\${Object.keys(${uppercase_collection}.fields).map(
 			(fieldname: keyof typeof ${uppercase_collection}["fields"]) =>
 				tempstream\`<td>\${item.get(fieldname)}</td>\`

package/src/templates/page.ts

@@ -4,7 +4,7 @@ export async function pageTemplate(
 	newfilefullpath: string
 ): Promise<string> {
 	const rel = curryImportPath(newfilefullpath);
-	return `import { BaseContext } from "koa";
+	return `import { Context } from "koa";
 import { tempstream } from "tempstream";
 import { Page } from "@sealcode/sealgen";
 import html from "${rel("src/back/html")}";
@@ -13,11 +13,11 @@ export const actionName = "${action_name}";
 
 export default new (class ${action_name}Page extends Page {
 	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	async canAccess(_: BaseContext) {
+	async canAccess(_: Context) {
 		return { canAccess: true, message: "" };
 	}
 
-	async render(ctx: BaseContext) {
+	async render(ctx: Context) {
 		return html(ctx, "${action_name}", tempstream/* HTML */ \`<div></div>\`);
 	}
 })();

package/src/templates/route-test.ts

@@ -8,7 +8,7 @@ export function testTemplate(action_name: string, new_file_fullpath: string) {
 import { LONG_TEST_TIMEOUT, webhintURL } from "${rel(
 		"src/back/test_utils/webhint"
 	)}";
-import { ${action_name}URL } from "${rel("src/back/routes/routes")}";
+import { ${action_name}URL } from "${rel("src/back/routes/urls")}";
 
 describe("${action_name}", () => {
 	it("doesn't crash", async function () {

package/src/utils/prettier.ts

@@ -0,0 +1,13 @@
+import * as prettier from "prettier";
+import { Options } from "prettier";
+import _locreq from "locreq";
+const target_locreq = _locreq(process.cwd());
+
+export async function getPrettierConfig(): Promise<Options> {
+	return {
+		...(await prettier.resolveConfig(
+			target_locreq.resolve("src/back/routes")
+		)),
+		parser: "typescript",
+	};
+}

package/src/utils/translate.ts

@@ -1,8 +1,8 @@
-import { BaseContext } from "koa";
+import { Context } from "koa";
 import { Translation } from "sealious";
 
 export function t(
-	ctx: BaseContext,
+	ctx: Context,
 	key: string,
 	props: any[],
 	default_translation: Translation

package/src/utils/url-with-new-params.ts

@@ -1,8 +1,8 @@
-import { BaseContext } from "koa";
+import { Context } from "koa";
 import qs from "qs";
 
 export function UrlWithNewParams(
-	ctx: BaseContext,
+	ctx: Context,
 	query_params: Record<string, unknown>
 ): string {
 	return `${ctx.path}?${qs.stringify(query_params)}`;