@sealcode/sealgen 0.11.7 → 0.12.0

package/src/forms/fields/field.ts

@@ -1,7 +1,7 @@
 import { Predicate, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { t } from "../../utils/translate";
-import { FormDataValue } from "../form";
+import { t } from "../../utils/translate.js";
+import { FormDataValue } from "../form-types.js";
 
 export type FormFieldValidationResponse = { valid: boolean; message: string };
 
@@ -154,19 +154,3 @@ export abstract class FormField<
 		return parsed;
 	}
 }
-
-export * from "./simple-form-field";
-export * from "./checkboxed-list";
-export * from "./collection-field";
-export * from "./number";
-export * from "./pick-from-list";
-export * from "./regexp";
-export * from "./email";
-export * from "./enum";
-export * from "./boolean";
-export * from "./enum-multiple";
-export * from "./existing-sealious-value";
-export * from "./file";
-export * from "./multiple-files";
-export * from "./reverse-single-reference";
-export * from "./structured-array";

package/src/forms/fields/fields.ts

@@ -0,0 +1,15 @@
+export * from "./simple-form-field.js";
+export * from "./checkboxed-list.js";
+export * from "./collection-field.js";
+export * from "./number.js";
+export * from "./pick-from-list.js";
+export * from "./regexp.js";
+export * from "./email.js";
+export * from "./enum.js";
+export * from "./boolean.js";
+export * from "./enum-multiple.js";
+export * from "./existing-sealious-value.js";
+export * from "./file.js";
+export * from "./multiple-files.js";
+export * from "./reverse-single-reference.js";
+export * from "./structured-array.js";

package/src/forms/fields/file.ts

@@ -1,18 +1,17 @@
 import {
-	hasField,
 	hasFieldOfType,
 	hasShape,
 	is,
 	predicates,
 } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { File as SealiousFile } from "sealious";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import Sealious from "sealious";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export type FileContainer = {
-	old: SealiousFile | null;
-	new: SealiousFile | null;
+	old: Sealious.File | null;
+	new: Sealious.File | null;
 };
 
 export class File<Required extends boolean> extends FormField<
@@ -25,7 +24,7 @@ export class File<Required extends boolean> extends FormField<
 	): Promise<FieldParseResult<FileContainer>> {
 		let result;
 		if (
-			raw_value instanceof SealiousFile ||
+			raw_value instanceof Sealious.File ||
 			(is(raw_value, predicates.object) &&
 				hasShape(
 					{
@@ -36,7 +35,7 @@ export class File<Required extends boolean> extends FormField<
 				) &&
 				raw_value.id)
 		) {
-			const file = await SealiousFile.fromID(
+			const file = await Sealious.File.fromID(
 				ctx.$app,
 				raw_value.id as string
 			);
@@ -59,7 +58,7 @@ export class File<Required extends boolean> extends FormField<
 					raw_value.old
 				) &&
 				raw_value.old.id
-					? await SealiousFile.fromID(ctx.$app, raw_value.old.id)
+					? await Sealious.File.fromID(ctx.$app, raw_value.old.id)
 					: null;
 			const new_file =
 				hasFieldOfType(

package/src/forms/fields/multiple-files.ts

@@ -1,6 +1,6 @@
 import { Context } from "koa";
 import { FieldTypes as SealiousFieldTypes } from "sealious";
-import { FormField } from "./field";
+import { FormField } from "./field.js";
 
 export class MultipleFiles extends FormField<false> {
 	constructor(

package/src/forms/fields/number.test.ts

@@ -1,5 +1,6 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import * as Sealgen from "../../index.js";
+const { Fields } = Sealgen;
 
 describe("number field", () => {
 	const ctx = {} as any;

package/src/forms/fields/number.ts

@@ -1,7 +1,7 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class NumberField<
 	DefaultValue extends number | null = number,

package/src/forms/fields/pick-from-list.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("pick-from-list field", () => {
 	const ctx = {} as any;

package/src/forms/fields/pick-from-list.ts

@@ -1,8 +1,8 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { DropdownOption } from "../controls/dropdown";
-import { FormFieldValidationResponse } from "./field";
-import { SimpleFormField } from "./simple-form-field";
+import type { DropdownOption } from "../controls/dropdown.js";
+import { FormFieldValidationResponse } from "./field.js";
+import { SimpleFormField } from "./simple-form-field.js";
 
 export class PickFromListField<
 	Required extends boolean

package/src/forms/fields/proxy-field.ts

@@ -1,4 +1,4 @@
-import { FormField } from "./field";
+import { FormField } from "./field.js";
 
 export class ProxyFormField<T> extends FormField<boolean, T> {
 	constructor(

package/src/forms/fields/regexp.test.ts

@@ -1,5 +1,5 @@
 import assert from "assert";
-import { Fields } from "../../index";
+import { Fields } from "../../index.js";
 
 describe("regexp field", () => {
 	const ctx = {} as any;

package/src/forms/fields/regexp.ts

@@ -1,7 +1,7 @@
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { FieldParseResult, FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class RegExpField<Required extends boolean> extends FormField<Required> {
 	constructor(

package/src/forms/fields/reverse-single-reference.ts

@@ -1,4 +1,4 @@
-import { FormField } from "./field";
+import { FormField } from "./field.js";
 import { FieldTypes as SealiousFields } from "sealious";
 import { Context } from "koa";
 

package/src/forms/fields/simple-form-field.ts

@@ -1,7 +1,7 @@
-import { FieldParseResult, FormField } from "./field";
-import { FormDataValue } from "../form";
+import { FormDataValue } from "../form-types.js";
 import { Context } from "koa";
 import { predicates } from "@sealcode/ts-predicates";
+import { FieldParseResult, FormField } from "./field.js";
 
 export class SimpleFormField<Required extends boolean> extends FormField<
 	Required,

package/src/forms/fields/structured-array.ts

@@ -1,7 +1,7 @@
 import { Context } from "koa";
 import { Field, FieldsetInput, FieldsetOutput, FieldTypes } from "sealious";
-import { FormDataValue } from "../form";
-import { FormField } from "./field";
+import { FormDataValue } from "../form-types.js";
+import { FormField } from "./field.js";
 
 export class StructuredArrayField<
 	Fields extends Record<string, Field>

package/src/forms/form-types.ts

@@ -0,0 +1,30 @@
+import type { File as SealiousFile } from "sealious";
+import type { FlatTemplatable } from "tempstream";
+import type { FormField } from "./fields/field.js";
+
+export type FormDataPrimitive = string | string[] | number | undefined;
+export type FormDataValue =
+	| FormDataPrimitive
+	| Record<string, FormDataPrimitive>
+	| SealiousFile;
+
+export type FieldValueType<F extends FormField> = F extends FormField<infer R>
+	? R
+	: never;
+
+export type FormFieldsToValues<
+	F extends Record<string, FormField<boolean, keyof F>>
+> = {
+	[Property in keyof F]: FieldValueType<F[Property]>;
+};
+
+export type FormMessage = { type: "info" | "success" | "error"; text: string };
+
+export type FormData<Fieldnames extends string = string> = {
+	raw_values: Record<Fieldnames, FormDataValue>;
+	messages: FormMessage[];
+};
+
+export type FormReaction =
+	| { action: "stay"; content: FlatTemplatable; messages?: FormMessage[] }
+	| { action: "redirect"; url: string; messages?: FormMessage[] };

package/src/forms/form.test.ts

@@ -1,12 +1,13 @@
 import Router from "@koa/router";
+import { describe, it, beforeAll, afterAll, afterEach, beforeEach } from "vitest";
 import axios from "axios";
 import Koa, { BaseContext } from "koa";
 import { Page } from "playwright";
-import { Controls, Fields, Form, FormDataValue, Mountable } from "../index";
-import { mount } from "../mount";
-import { locator_is_visible } from "../test_utils/locator_is_visible";
-import { getBrowser } from "../utils/browser-creator";
-import { assertThrowsAsync } from "../utils/utils";
+import { Controls, Fields, Form, FormDataValue, Mountable } from "../index.js";
+import { mount } from "../mount.js";
+import { locator_is_visible } from "../test_utils/locator_is_visible.js";
+import { getBrowser } from "../utils/browser-creator.js";
+import { assertThrowsAsync } from "../utils/utils.js";
 
 const fields = {
 	text: new Fields.SimpleFormField(true),
@@ -34,7 +35,7 @@ export function form_factory(canAccessFun?: Mountable["canAccess"]): Form<typeof
 describe("form test", () => {
 	let page: Page;
 
-	before(async () => {
+	beforeAll(async () => {
 		const browser = await getBrowser();
 		const context = await browser.newContext();
 		page = await context.newPage();
@@ -43,7 +44,7 @@ describe("form test", () => {
 	describe("basic tests", async () => {
 		let server: ReturnType<Koa["listen"]>;
 
-		before(async () => {
+		beforeAll(async () => {
 			const app = new Koa();
 			const router = new Router();
 
@@ -53,7 +54,7 @@ describe("form test", () => {
 			await page.goto("http://localhost:8080");
 		});
 
-		after(async () => {
+		afterAll(async () => {
 			server.close();
 		});
 
@@ -123,7 +124,7 @@ describe("form test", () => {
 			const app = new Koa();
 			const router = new Router();
 
-			before(async () => {
+			beforeAll(async () => {
 				mount(
 					router,
 					"/",
@@ -131,6 +132,7 @@ describe("form test", () => {
 						async (
 							ctx: Koa.Context
 						): Promise<{ canAccess: boolean; message: string }> => {
+							console.log("CAN ACCESS? FALSE");
 							return { canAccess: false, message: "" };
 						}
 					),
@@ -144,6 +146,7 @@ describe("form test", () => {
 			});
 
 			it("prevents the form from rendering", async () => {
+				console.log("CONSOLELOG TEST");
 				const response = await page.goto("http://localhost:8080");
 				if (response?.status() != 403) {
 					throw new Error(
@@ -227,7 +230,7 @@ describe("form test", () => {
 		describe("validation message", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			before(async () => {
+			beforeAll(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -268,7 +271,7 @@ describe("form test", () => {
 				await page.goto("http://localhost:8080");
 			});
 
-			after(async () => {
+			afterAll(async () => {
 				server.close();
 			});
 
@@ -293,7 +296,7 @@ describe("form test", () => {
 		describe("field specific validation message", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			before(async () => {
+			beforeAll(async () => {
 				const app = new Koa();
 				const router = new Router();
 				const fields = {
@@ -325,7 +328,7 @@ describe("form test", () => {
 				await page.goto("http://localhost:8080");
 			});
 
-			after(async () => {
+			afterAll(async () => {
 				server.close();
 			});
 

package/src/forms/form.ts

@@ -1,6 +1,6 @@
 import { Context } from "koa";
 import { randomUUID } from "crypto";
-import { File as SealiousFile } from "sealious";
+
 import Router from "@koa/router";
 import { FlatTemplatable, tempstream } from "tempstream";
 import {
@@ -9,39 +9,19 @@ import {
 	is,
 	predicates,
 } from "@sealcode/ts-predicates";
-import { FormField } from "./fields/field";
+
+import {
+	FormData,
+	FormDataValue,
+	FormMessage,
+	FormReaction,
+} from "./form-types.js";
+
 import {
 	Fields,
 	MountableWithFields,
 	PageErrorMessage,
-} from "../page/mountable-with-fields";
-
-export type FormDataPrimitive = string | string[] | number | undefined;
-export type FormDataValue =
-	| FormDataPrimitive
-	| Record<string, FormDataPrimitive>
-	| SealiousFile;
-
-export type FieldValueType<F extends FormField> = F extends FormField<infer R>
-	? R
-	: never;
-
-export type FormFieldsToValues<
-	F extends Record<string, FormField<boolean, keyof F>>
-> = {
-	[Property in keyof F]: FieldValueType<F[Property]>;
-};
-
-export type FormMessage = { type: "info" | "success" | "error"; text: string };
-
-export type FormData<Fieldnames extends string = string> = {
-	raw_values: Record<Fieldnames, FormDataValue>;
-	messages: FormMessage[];
-};
-
-export type FormReaction =
-	| { action: "stay"; content: FlatTemplatable; messages?: FormMessage[] }
-	| { action: "redirect"; url: string; messages?: FormMessage[] };
+} from "../page/mountable-with-fields.js";
 
 export abstract class Form<
 	F extends Fields,
@@ -51,7 +31,7 @@ export abstract class Form<
 	submitButtonText = "Wyślij";
 	action = "./";
 	useTurbo = true;
-	form_id = randomUUID();
+	form_id = randomUUID() as string;
 
 	async canAccess(
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars

package/src/forms/multiform.test.ts

@@ -4,21 +4,26 @@ import axios from "axios";
 import { Browser, firefox, Page } from "playwright";
 import { expect } from "@playwright/test";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { Controls, Fields, Form, Mountable } from "..";
-import { mount } from "../mount";
-import { FormDataValue, FormMessage } from "./form";
-import { Multiform } from "./multiform";
-import { assertThrowsAsync } from "../utils/utils";
-import { form_factory } from "./form.test";
-import { getBrowser } from "../utils/browser-creator";
+import { mount } from "../mount.js";
+import { Multiform } from "./multiform.js";
+import { assertThrowsAsync } from "../utils/utils.js";
+import { form_factory } from "./form.test.js";
+import { getBrowser } from "../utils/browser-creator.js";
+import { SimpleFormField } from "./fields/simple-form-field.js";
+import { Form } from "./form.js";
+import { FormHeader } from "./controls/form-header.js";
+import { SimpleInput } from "./controls/simple-input.js";
+import { Mountable } from "../page/mountable.js";
+import { FormDataValue, FormMessage } from "./form-types.js";
+import { EmailField } from "./fields/email.js";
 
 const fields1 = {
-	email: new Fields.SimpleFormField(true),
+	email: new SimpleFormField(true),
 };
 
 const form1 = new (class extends Form<typeof fields1, void> {
 	defaultSuccessMessage = "Form1 done!";
-	controls = [new Controls.FormHeader("form1"), new Controls.SimpleInput(fields1.email)];
+	controls = [new FormHeader("form1"), new SimpleInput(fields1.email)];
 	fields = fields1;
 	onSubmit() {
 		return;
@@ -26,12 +31,12 @@ const form1 = new (class extends Form<typeof fields1, void> {
 })();
 
 const fields2 = {
-	name: new Fields.SimpleFormField(true),
+	name: new SimpleFormField(true),
 };
 
 const form2 = new (class extends Form<Record<never, unknown>, void> {
 	defaultSuccessMessage = "Form2 done!";
-	controls = [new Controls.FormHeader("form2"), new Controls.SimpleInput(fields2.name)];
+	controls = [new FormHeader("form2"), new SimpleInput(fields2.name)];
 	fields = fields2;
 	onSubmit() {
 		return;
@@ -68,7 +73,7 @@ function multiform_factory(
 async function tests(js_enabled: boolean) {
 	let page: Page;
 
-	before(async () => {
+	beforeAll(async () => {
 		const browser = await getBrowser();
 		const context = await browser.newContext({
 			javaScriptEnabled: js_enabled,
@@ -118,7 +123,7 @@ async function individual_field_validation_e2e_tests(javaScriptEnabled: boolean)
 	let browser: Browser;
 	let page: Page;
 
-	before(async () => {
+	beforeAll(async () => {
 		browser = await getBrowser();
 		const context = await browser.newContext({
 			javaScriptEnabled,
@@ -148,7 +153,7 @@ describe("multiform test", () => {
 	describe("basic tests", async () => {
 		let server: ReturnType<Koa["listen"]>;
 
-		before(async () => {
+		beforeAll(async () => {
 			const app = new Koa();
 			const router = new Router();
 
@@ -189,7 +194,7 @@ describe("multiform test", () => {
 			server = app.listen(8080);
 		});
 
-		after(() => {
+		afterAll(() => {
 			server.close();
 		});
 
@@ -202,7 +207,7 @@ describe("multiform test", () => {
 		let server: ReturnType<Koa["listen"]>;
 
 		describe("allow access to both forms when both canAccess return true", async () => {
-			before(async () => {
+			beforeAll(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -230,7 +235,7 @@ describe("multiform test", () => {
 				page = await context.newPage();
 			});
 
-			after(async () => {
+			afterAll(async () => {
 				server.close();
 			});
 
@@ -263,7 +268,7 @@ describe("multiform test", () => {
 		});
 
 		describe("deny access to both forms", async () => {
-			before(async () => {
+			beforeAll(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -291,7 +296,7 @@ describe("multiform test", () => {
 				page = await context.newPage();
 			});
 
-			after(async () => {
+			afterAll(async () => {
 				server.close();
 			});
 
@@ -322,7 +327,7 @@ describe("multiform test", () => {
 		});
 
 		describe("allow access to one form, deny to the other", async () => {
-			before(async () => {
+			beforeAll(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -350,7 +355,7 @@ describe("multiform test", () => {
 				page = await context.newPage();
 			});
 
-			after(async () => {
+			afterAll(async () => {
 				server.close();
 			});
 
@@ -405,7 +410,7 @@ describe("multiform test", () => {
 		describe("basic tests", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			before(async () => {
+			beforeAll(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -419,7 +424,7 @@ describe("multiform test", () => {
 								fields = fields1;
 								submitButtonText = "Submit";
 								controls = [
-									new Controls.SimpleInput(fields1.email, {
+									new SimpleInput(fields1.email, {
 										label: "This is a test:",
 										type: "text",
 									}),
@@ -466,7 +471,7 @@ describe("multiform test", () => {
 				server = app.listen(8080);
 			});
 
-			after(async () => {
+			afterAll(async () => {
 				server.close();
 			});
 
@@ -477,11 +482,11 @@ describe("multiform test", () => {
 		describe("field specific validation", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			before(async () => {
+			beforeAll(async () => {
 				const app = new Koa();
 				const router = new Router();
 				const fields = {
-					text: new Fields.EmailField(true),
+					text: new EmailField(true),
 				};
 
 				mount(
@@ -494,7 +499,7 @@ describe("multiform test", () => {
 								fields = fields;
 								submitButtonText = "Submit";
 								controls = [
-									new Controls.SimpleInput(fields.text, {
+									new SimpleInput(fields.text, {
 										label: "This is a test:",
 										type: "text",
 									}),
@@ -529,7 +534,7 @@ describe("multiform test", () => {
 				server = app.listen(8080);
 			});
 
-			after(async () => {
+			afterAll(async () => {
 				server.close();
 			});
 

package/src/forms/multiform.ts

@@ -2,9 +2,10 @@ import Router from "@koa/router";
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { Form, FormDataValue, FormMessage } from "..";
-import { Fields, MountableWithFields } from "../page/mountable-with-fields";
-import { attribute } from "../sanitize";
+import { Fields, MountableWithFields } from "../page/mountable-with-fields.js";
+import { attribute } from "../sanitize.js";
+import type { FormDataValue, FormMessage, FormData } from "./form-types.js";
+import { Form } from "./form.js";
 
 const FIELD_PREFIX_SEPARATOR = "___";
 

package/src/generate-collections.ts

@@ -2,7 +2,7 @@ import _locreq from "locreq";
 import * as prettier from "prettier";
 import { promises as fs } from "fs";
 import { assertType, predicates } from "@sealcode/ts-predicates";
-import { getPrettierConfig } from "./utils/prettier";
+import { getPrettierConfig } from "./utils/prettier.js";
 
 const target_locreq = _locreq(process.cwd());
 

package/src/generate-components.ts

@@ -2,15 +2,17 @@ import _locreq from "locreq";
 import * as prettier from "prettier";
 import { promises as fs } from "fs";
 import { assertType, predicates } from "@sealcode/ts-predicates";
-import { getPrettierConfig } from "./utils/prettier";
+import { getPrettierConfig } from "./utils/prettier.js";
 import recursive from "recursive-readdir";
 import path from "path";
 import { toKebabCase, toPascalCase } from "js-convert-case";
+import { mkdir } from "fs/promises";
 
 const target_locreq = _locreq(process.cwd());
 
 export async function generateComponents(): Promise<void> {
 	const components_dir = target_locreq.resolve("src/back/jdd-components");
+	await mkdir(components_dir, { recursive: true });
 	const component_names = (await recursive(components_dir)).filter((c) =>
 		c.endsWith(".jdd.tsx")
 	);

package/src/generate-routes.ts

@@ -2,12 +2,12 @@ import { promises as fs } from "fs";
 import * as prettier from "prettier";
 import { relative } from "path";
 import _locreq from "locreq";
-import { walkDir } from "./utils/walk";
-import { importPath } from "./utils/import-path";
+import { walkDir } from "./utils/walk.js";
+import { importPath } from "./utils/import-path.js";
 import { assertType, predicates } from "@sealcode/ts-predicates";
-import { unescape_url_params } from "./utils/escape-url-params";
-import { getPrettierConfig } from "./utils/prettier";
-import { Templates } from "./templates/templates";
+import { unescape_url_params } from "./utils/escape-url-params.js";
+import { getPrettierConfig } from "./utils/prettier.js";
+import { Templates } from "./templates/templates.js";
 
 const target_locreq = _locreq(process.cwd());