@sealcode/sealgen 0.15.1 → 0.15.3

package/src/forms/multiform.test.ts

@@ -77,7 +77,7 @@ function multiform_factory(
 async function tests(js_enabled: boolean) {
 	let page: Page;
 
-	beforeAll(async () => {
+	before(async () => {
 		const browser = await getBrowser();
 		const context = await browser.newContext({
 			javaScriptEnabled: js_enabled,
@@ -127,7 +127,7 @@ async function individual_field_validation_e2e_tests(javaScriptEnabled: boolean)
 	let browser: Browser;
 	let page: Page;
 
-	beforeAll(async () => {
+	before(async () => {
 		browser = await getBrowser();
 		const context = await browser.newContext({
 			javaScriptEnabled,
@@ -157,7 +157,7 @@ describe("multiform test", () => {
 	describe("basic tests", async () => {
 		let server: ReturnType<Koa["listen"]>;
 
-		beforeAll(async () => {
+		before(async () => {
 			const app = new Koa();
 			const router = new Router();
 
@@ -198,7 +198,7 @@ describe("multiform test", () => {
 			server = app.listen(port);
 		});
 
-		afterAll(() => {
+		after(() => {
 			server.close();
 		});
 
@@ -211,7 +211,7 @@ describe("multiform test", () => {
 		let server: ReturnType<Koa["listen"]>;
 
 		describe("allow access to both forms when both canAccess return true", async () => {
-			beforeAll(async () => {
+			before(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -239,7 +239,7 @@ describe("multiform test", () => {
 				page = await context.newPage();
 			});
 
-			afterAll(async () => {
+			after(async () => {
 				server.close();
 			});
 
@@ -272,7 +272,7 @@ describe("multiform test", () => {
 		});
 
 		describe("deny access to both forms", async () => {
-			beforeAll(async () => {
+			before(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -300,7 +300,7 @@ describe("multiform test", () => {
 				page = await context.newPage();
 			});
 
-			afterAll(async () => {
+			after(async () => {
 				server.close();
 			});
 
@@ -331,7 +331,7 @@ describe("multiform test", () => {
 		});
 
 		describe("allow access to one form, deny to the other", async () => {
-			beforeAll(async () => {
+			before(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -359,7 +359,7 @@ describe("multiform test", () => {
 				page = await context.newPage();
 			});
 
-			afterAll(async () => {
+			after(async () => {
 				server.close();
 			});
 
@@ -414,7 +414,7 @@ describe("multiform test", () => {
 		describe("basic tests", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			beforeAll(async () => {
+			before(async () => {
 				const app = new Koa();
 				const router = new Router();
 
@@ -475,7 +475,7 @@ describe("multiform test", () => {
 				server = app.listen(port);
 			});
 
-			afterAll(async () => {
+			after(async () => {
 				server.close();
 			});
 
@@ -486,7 +486,7 @@ describe("multiform test", () => {
 		describe("field specific validation", async () => {
 			let server: ReturnType<Koa["listen"]>;
 
-			beforeAll(async () => {
+			before(async () => {
 				const app = new Koa();
 				const router = new Router();
 				const fields = {
@@ -538,7 +538,7 @@ describe("multiform test", () => {
 				server = app.listen(port);
 			});
 
-			afterAll(async () => {
+			after(async () => {
 				server.close();
 			});
 

package/src/forms/multiform.ts

@@ -1,10 +1,11 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import Router from "@koa/router";
 import { is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
 import { Fields, MountableWithFields } from "../page/mountable-with-fields.js";
 import { attribute } from "../sanitize.js";
-import type { FormDataValue, FormMessage, FormData } from "./form-types.js";
+import type { FormDataValue, FormMessage } from "./form-types.js";
 import { Form } from "./form.js";
 
 const FIELD_PREFIX_SEPARATOR = "___";

package/src/generate-components.ts

@@ -1,7 +1,6 @@
 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.js";
 import recursive from "recursive-readdir";
 import path from "path";
@@ -23,7 +22,7 @@ export async function generateComponents(): Promise<void> {
 				path.relative(components_dir, p).replace(/\.[tj]sx?$/, ".js")
 		)
 		.map((relative_path) => {
-			const name = relative_path.match(/\/([^\/]+).jdd/)?.[1];
+			const name = relative_path.match(/\/([^/]+).jdd/)?.[1];
 			return { name, relative_path };
 		});
 

package/src/generate-routes.test.ts

@@ -1,6 +1,7 @@
 import { generateURL } from "./generate-routes.js";
 import * as prettier from "prettier";
 import { getPrettierConfig } from "./utils/prettier.js";
+import assert from "node:assert";
 
 describe("generate routes", () => {
 	it("handles a url with params", async () => {

package/src/generate-stimulus.ts

@@ -23,7 +23,7 @@ export async function generateStimulusControllers(): Promise<void> {
 					.replace(/\.[tj]sx?$/, ".js")
 		)
 		.map((relative_path) => {
-			const name = relative_path.match(/\/([^\/]+).stimulus/)?.[1];
+			const name = relative_path.match(/\/([^/]+).stimulus/)?.[1];
 			return { name, relative_path };
 		});
 

package/src/get-fonts.ts

@@ -7,7 +7,9 @@ export const FONTS_CONFIG_PATH = "src/fonts.json";
 export async function getFonts(_: Record<string, string | boolean> = {}) {
 	const fonts_config_path = target_locreq.resolve(FONTS_CONFIG_PATH);
 
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 	const fonts_config = JSON.parse(await readFile(fonts_config_path, "utf8"));
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
 	const fonts_url = constructURL(fonts_config.googleFonts);
 	if (!fonts_url) {
 		throw new Error("Invalid font config");

package/src/mount.ts

@@ -1,4 +1,6 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import Router from "@koa/router";
+import { FileManager } from "@sealcode/file-manager";
 import Koa, { BaseContext, Context } from "koa";
 import { Middlewares as SealiousMiddlewares } from "sealious";
 import { Mountable } from "./page/mountable.js";
@@ -16,7 +18,10 @@ export function mount(
 	router: Router,
 	url: string | { rawURL: string },
 	mountable: Mountable,
-	use_dummy_app = false
+	use_dummy_app = false,
+	file_manager: FileManager | undefined = use_dummy_app
+		? new FileManager("/tmp", "/uploaded_files")
+		: undefined
 ): void {
 	const raw_url = typeof url === "string" ? url : url.rawURL;
 	const args = use_dummy_app
@@ -48,12 +53,12 @@ export function mount(
 					// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 					await next();
 				},
-				SealiousMiddlewares.parseBody(),
+				SealiousMiddlewares.parseBody(file_manager),
 				handleHtmlPromise,
 		  ]
 		: [
 				SealiousMiddlewares.extractContext(),
-				SealiousMiddlewares.parseBody(),
+				SealiousMiddlewares.parseBody(file_manager),
 				handleHtmlPromise,
 		  ];
 

package/src/notifier.ts

@@ -15,7 +15,9 @@ export function make_notifier(port: number) {
 		});
 	});
 
-	console.log("build notifier listening on websocket at port " + port);
+	console.log(
+		"build notifier listening on websocket at port " + port.toString()
+	);
 	return function notify(message: string) {
 		sockets.forEach((s) => s.send(message));
 	};

package/src/page/list.ts

@@ -73,7 +73,7 @@ export abstract class ListPage<
 	init(): void {
 		super.init();
 		for (const [fieldname, field] of Object.entries(this.filterFields)) {
-			field.init(fieldname);
+			void field.init(fieldname);
 		}
 	}
 

package/src/page/mountable-with-fields.ts

@@ -15,6 +15,7 @@ import { Mountable } from "./mountable.js";
 
 export type PageErrorMessage = { type: "access" | "internal"; message: string };
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type Fields = Record<string, FormField<boolean, any>>;
 
 export abstract class MountableWithFields<
@@ -32,7 +33,7 @@ export abstract class MountableWithFields<
 
 	init(): void {
 		for (const [name, field] of Object.entries(this.fields)) {
-			field.init(name);
+			void field.init(name);
 		}
 	}
 
@@ -141,6 +142,7 @@ export abstract class MountableWithFields<
 		const result: Record<string, unknown> = {};
 		const promises = Object.entries(this.fields).map(
 			async ([key, field]) => {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				const { parsed } = await field.getValue(ctx, raw_values);
 				result[key] = parsed;
 			}

package/src/page/sealious-list.ts

@@ -48,6 +48,7 @@ export abstract class SealiousItemListPage<
 		const query = this.collection.list(await this.getContextForList(ctx));
 		const sort = await this.getSort(ctx);
 		if (sort) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-explicit-any
 			query.sort({ [sort.field]: sort.order } as any);
 		}
 		return query;
@@ -69,7 +70,7 @@ export abstract class SealiousItemListPage<
 	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(
+		const filter_values: Record<string, string | undefined> = is(
 			_filter_values,
 			predicates.record(predicates.string, predicates.string)
 		)
@@ -81,7 +82,7 @@ export abstract class SealiousItemListPage<
 	async renderItem(
 		_: Context,
 		item: CollectionItem<C>,
-		index: number
+		_index: number
 	): Promise<FlatTemplatable> {
 		return `<div>${item.id}</div>`;
 	}

package/src/page/stateful-page.ts

@@ -1,11 +1,13 @@
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import Router from "@koa/router";
-import { predicates, hasShape, is, hasField } from "@sealcode/ts-predicates";
+import { predicates, hasShape, is } from "@sealcode/ts-predicates";
 import deepmerge, { ArrayMergeOptions } from "deepmerge";
-import { BaseContext } from "koa";
+import { BaseContext, Context } from "koa";
 import { Templatable, tempstream } from "tempstream";
 import { from_base64, to_base64 } from "../utils/base64.js";
 import { ExtractTail } from "../utils/utils.js";
 import { Mountable } from "./mountable.js";
+import { isPlainObject } from "is-what";
 
 export type StatefulPageActionDescription<ActionName> =
 	| {
@@ -55,7 +57,7 @@ export abstract class StatefulPage<
 
 	constructor() {
 		super();
-		const original_render = this.render.bind(this);
+		const original_render = this.render.bind(this) as typeof this.render;
 		this.render = async (
 			ctx: BaseContext,
 			state: State,
@@ -63,7 +65,8 @@ export abstract class StatefulPage<
 		) => {
 			return this.wrapInLayout(
 				ctx,
-				this.wrapInForm(
+				await this.wrapInForm(
+					ctx as Context,
 					state,
 					await original_render(ctx, state, inputs)
 				),
@@ -78,12 +81,20 @@ export abstract class StatefulPage<
 		state: State
 	): Templatable;
 
-	wrapInForm(state: State, content: Templatable): Templatable {
-		return tempstream/* HTML */ `<form action="./" method="POST">
+	async wrapInForm(
+		context: Context,
+		state: State,
+		content: Templatable
+	): Promise<Templatable> {
+		return tempstream/* HTML */ `<form
+			action="./"
+			method="POST"
+			enctype="multipart/form-data"
+		>
 			<input
 				name="state"
 				type="hidden"
-				value="${to_base64(JSON.stringify(state))}"
+				value="${to_base64(await this.serializeState(context, state))}"
 			/>
 			${content}
 		</form>`;
@@ -110,8 +121,9 @@ export abstract class StatefulPage<
 		...args: ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>
 	) {
 		const { action } = this.extractActionAndLabel(action_description);
-		return `./?action=${action}&action_args=${to_base64(
-			JSON.stringify(args)
+		return `./?action=${action}&action_args=${encodeURIComponent(
+			// encoding as URI Component because sometimes it can contain a "+" which is treated as a space
+			to_base64(JSON.stringify(args))
 		)}`;
 	}
 
@@ -120,7 +132,8 @@ export abstract class StatefulPage<
 		action_description: StatefulPageActionDescription<ActionName>,
 		...args: ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>
 	) {
-		let { label, content } = this.extractActionAndLabel(action_description);
+		const { label, content } =
+			this.extractActionAndLabel(action_description);
 		return /* HTML */ `
 			<button
 				type="submit"
@@ -156,15 +169,27 @@ export abstract class StatefulPage<
 	}
 
 	async preprocessOverrides(
-		state: State,
+		_state: State,
 		values: Record<string, unknown>
 	): Promise<Record<string, unknown>> {
 		return values;
 	}
 
+	async serializeState(_context: BaseContext, state: State): Promise<string> {
+		return JSON.stringify(state);
+	}
+
+	async deserializeState(_context: BaseContext, s: string): Promise<State> {
+		const deserialized = JSON.parse(s) as unknown;
+		console.log("stateful-page.ts:183", "deserialized:");
+		console.dir(deserialized, { depth: 10 });
+		return deserialized as State;
+	}
+
 	async extractState(
 		ctx: BaseContext
 	): Promise<StateAndMetadata<State, Actions>> {
+		console.log("stateful-page.ts:188", "EXTRACT STATE");
 		if (
 			!hasShape(
 				{
@@ -188,7 +213,8 @@ export abstract class StatefulPage<
 		// the "$" key is parsed as dot notation and overrides the state
 
 		const original_state_string = ctx.$body.state;
-		const original_state = JSON.parse(
+		const original_state = await this.deserializeState(
+			ctx,
 			typeof original_state_string == "string"
 				? from_base64(original_state_string)
 				: "{}"
@@ -201,6 +227,7 @@ export abstract class StatefulPage<
 			state_overrides
 		);
 		let modified_state = deepmerge(original_state, state_overrides, {
+			isMergeableObject: isPlainObject,
 			arrayMerge: (
 				target: any[],
 				source: any[],
@@ -208,7 +235,7 @@ export abstract class StatefulPage<
 			) => {
 				// https://github.com/TehShrike/deepmerge?tab=readme-ov-file#arraymerge-example-combine-arrays
 				const destination = target.slice();
-
+				/* eslint-disable @typescript-eslint/no-unsafe-argument */
 				source.forEach((item, index) => {
 					if (typeof destination[index] === "undefined") {
 						destination[index] =
@@ -217,15 +244,18 @@ export abstract class StatefulPage<
 								options
 							);
 					} else if (options.isMergeableObject(item)) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 						destination[index] = deepmerge(
 							target[index],
 							item,
 							options
 						);
 					} else if (target.indexOf(item) === -1) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 						destination[index] = item;
 					}
 				});
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-return
 				return destination;
 			},
 		}) as State;
@@ -236,7 +266,7 @@ export abstract class StatefulPage<
 		if (ctx.$body.action && ctx.$body.action_args) {
 			return {
 				state: modified_state,
-				action: ctx.$body.action as string,
+				action: ctx.$body.action,
 				inputs,
 				action_args: ctx.$body.action_args,
 			};
@@ -260,17 +290,16 @@ export abstract class StatefulPage<
 			const { action, state, inputs, action_args } =
 				await this.extractState(ctx);
 			if (action) {
-				ctx.body = this.render(
-					ctx,
-					await this.actions[action](
-						state,
-						inputs,
-						...(JSON.parse(
-							from_base64(action_args as string)
-						) as unknown[])
-					),
-					inputs
+				const new_state = await this.actions[action](
+					state,
+					inputs,
+					...(JSON.parse(
+						from_base64(action_args as string)
+					) as unknown[])
 				);
+				console.log("stateful-page.ts:291", "new_state:");
+				console.dir(new_state, { depth: 10 });
+				ctx.body = this.render(ctx, new_state, inputs);
 			} else {
 				ctx.body = this.render(ctx, state, inputs);
 			}

package/src/templates/jdd-component.ts

@@ -4,7 +4,7 @@ export function jddComponentTemplate(component_name: string) {
 	return `import type { FlatTemplatable } from "tempstream";
 import { TempstreamJSX } from "tempstream";
 import type {
-	ExtractStructuredComponentArgumentsValues,
+	ExtractStructuredComponentArgumentsParsed,
 	JDDContext,
 } from "@sealcode/jdd";
 import { Component, ComponentArguments } from "@sealcode/jdd";
@@ -25,7 +25,7 @@ export class ${toPascalCase(
 		{
 			title,
 			content,
-		}: ExtractStructuredComponentArgumentsValues<typeof component_arguments>,
+		}: ExtractStructuredComponentArgumentsParsed<typeof component_arguments>,
 		{ render_markdown }: JDDContext
 	): FlatTemplatable {
 		return (

package/src/utils/extract-fields-from-collection.ts

@@ -2,6 +2,7 @@ import _locreq from "locreq";
 import { exec } from "./utils.js";
 const target_locreq = _locreq(process.cwd());
 import { promises as fs } from "fs";
+import { is, predicates } from "@sealcode/ts-predicates";
 
 export default async function extract_fields_from_collection(
 	collection_name: string
@@ -25,5 +26,22 @@ console.log(JSON.stringify(fields));
 	await fs.writeFile(extractor_code_path, extractor_code);
 	const { stdout } = await exec("node", [extractor_code_path]);
 	await fs.unlink(extractor_code_path);
-	return JSON.parse(stdout);
+	const ret = JSON.parse(stdout) as unknown;
+	if (
+		!is(
+			ret,
+			predicates.array(
+				predicates.shape({
+					name: predicates.string,
+					type: predicates.string,
+				})
+			)
+		)
+	) {
+		throw new Error(
+			"Encountered a problem while extracting the names of fields from collection. Got: " +
+				stdout
+		);
+	}
+	return ret;
 }

package/src/utils/translate.ts

@@ -4,7 +4,7 @@ import { Translation } from "sealious";
 export function t(
 	ctx: Context,
 	key: string,
-	props: any[],
+	props: unknown[],
 	default_translation: Translation
 ) {
 	return /* HTML */ `<span translation-key="${key.replace('"', '\\"')}"

package/src/utils/utils.ts

@@ -2,9 +2,11 @@ export type Awaited<T> = T extends Promise<infer U> ? U : T;
 export type UnwrapArray<T> = T extends Array<infer U> ? U : T;
 
 export function keys<S extends string>(object: Record<S, unknown>): S[] {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-explicit-any
 	return Object.keys(object) as any;
 }
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type ExtractTail<T extends any[]> = T extends [infer _, ...infer Tail]
 	? Tail
 	: never;

package/test.cjs

@@ -0,0 +1,54 @@
+const mri = require("mri");
+const { spawn } = require("child_process");
+
+const argv = process.argv.slice(2);
+const args = mri(argv);
+
+const bin_dir = "./node_modules/.bin/";
+
+const mocha = bin_dir + "mocha";
+
+let mocha_options = [
+	"--recursive",
+	"--timeout=10000",
+	"--require",
+	"source-map-support/register",
+	"--exit",
+];
+
+if (args["test-report"]) {
+	mocha_options = [
+		...mocha_options,
+		// "--require",
+		// "ts-node/register",
+		// "--require",
+		// "./src/http/type-overrides.ts",
+		"--reporter",
+		"xunit",
+		"--reporter-option",
+		"output=.xunit",
+	];
+}
+
+const mocha_files = ["lib/**/*.test.js"];
+
+let command = [mocha, ...mocha_options, ...mocha_files];
+
+if (args.debug) {
+	command = ["node", "inspect", ...command];
+}
+
+console.log("spawning mocha...", command.join(" "));
+
+const proc = spawn(command[0], command.slice(1), {
+	stdio: "inherit",
+	env: process.env,
+});
+
+proc.on("exit", function (code) {
+	if (args["test-report"]) {
+		process.exit(0);
+	} else {
+		process.exit(code);
+	}
+});

package/tsconfig.json

@@ -1,7 +1,7 @@
 {
 	"compilerOptions": {
-		"module": "es2022",
-		"moduleResolution": "node16",
+		"module": "nodenext",
+		"moduleResolution": "nodenext",
 		"noImplicitAny": true,
 		"noImplicitThis": true,
 		"strictNullChecks": true,
@@ -9,7 +9,7 @@
 		"declaration": true,
 		"esModuleInterop": true,
 		"lib": ["ES6", "ESNext"],
-		"outDir": "dist",
+		"outDir": "lib",
 		"checkJs": false,
 		"allowJs": true,
 		"declarationDir": "@types",
@@ -17,7 +17,6 @@
 		"sourceMap": true,
 		"allowSyntheticDefaultImports": true,
 		"skipLibCheck": true,
-		"types": ["vitest/globals"]
 	},
 
 	"include": ["src/**/*"],

package/dist/back/routes/sample.page.js

@@ -1,17 +0,0 @@
-import { Page } from "@sealcode/sealgen";
-import html from "../html.js";
-const actionName = "Sample";
-var sample_page_default = new class SamplePage extends Page {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  async canAccess(_) {
-    return { canAccess: true, message: "" };
-  }
-  async render(ctx) {
-    return html(ctx, "Sample", /* @__PURE__ */ React.createElement("div", null));
-  }
-}();
-export {
-  actionName,
-  sample_page_default as default
-};
-//# sourceMappingURL=sample.page.js.map