@sealcode/sealgen 0.15.59 → 0.15.61

package/@types/src/page/stateful-page.d.ts

@@ -2,7 +2,6 @@
 import Router from "@koa/router";
 import { BaseContext, Context } from "koa";
 import { Templatable } from "tempstream";
-import { ExtractTail } from "../utils/utils.js";
 import { Mountable } from "./mountable.js";
 export type StatefulPageActionDescription<ActionName> = {
     action: ActionName;
@@ -22,7 +21,16 @@ export type StateAndMetadata<State, Actions> = {
     action_args: null;
     $: Record<string, unknown>;
 };
-export declare abstract class StatefulPage<State extends Record<string, unknown>, Actions extends Record<string, (ctx: BaseContext, state: State, inputs: Record<string, string>, ...args: unknown[]) => State | Promise<State>>> extends Mountable {
+export type StatefulPageActionArgument<State extends Record<string, unknown>, Args extends unknown[] = unknown[]> = {
+    ctx: BaseContext;
+    state: State;
+    inputs: Record<string, string>;
+    args: Args;
+    page: StatefulPage<any, any>;
+};
+export type StatefulPageAction<State extends Record<string, unknown>, Args extends unknown[] = unknown[]> = (obj: StatefulPageActionArgument<State, Args>) => State | Promise<State>;
+export type ExtractStatefulPageActionArgs<X> = X extends StatefulPageAction<any, infer Args> ? Args : never;
+export declare abstract class StatefulPage<State extends Record<string, unknown>, Actions extends Record<string, StatefulPageAction<State>>> extends Mountable {
     abstract actions: Actions;
     abstract getInitialState(ctx: BaseContext): State | Promise<State>;
     abstract render(ctx: BaseContext, state: State, inputs: Record<string, string>): Templatable | Promise<Templatable>;
@@ -39,12 +47,12 @@ export declare abstract class StatefulPage<State extends Record<string, unknown>
         content: string;
         disabled: boolean;
     };
-    makeActionURL<ActionName extends keyof Actions>(action_description: StatefulPageActionDescription<ActionName>, ...args: ExtractTail<ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>>): string;
-    makeActionButton<ActionName extends keyof Actions>(_state: State, action_description: StatefulPageActionDescription<ActionName>, ...args: ExtractTail<ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>>): string;
+    makeActionURL<ActionName extends keyof Actions>(action_description: StatefulPageActionDescription<ActionName>, ...args: ExtractStatefulPageActionArgs<Actions[ActionName]>): string;
+    makeActionButton<ActionName extends keyof Actions>(_state: State, action_description: StatefulPageActionDescription<ActionName>, ...args: ExtractStatefulPageActionArgs<Actions[ActionName]>): string;
     makeActionCallback<ActionName extends keyof Actions>(action_description: {
         action: ActionName;
         label?: string;
-    } | ActionName, ...args: ExtractTail<ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>>): string;
+    } | ActionName, ...args: ExtractStatefulPageActionArgs<Actions[ActionName]>): string;
     rerender(): string;
     preprocessState(values: State): Promise<State>;
     preprocessOverrides(_context: BaseContext, _state: State, values: Record<string, unknown>): Promise<Record<string, unknown>>;

package/lib/page/stateful-page.js

@@ -176,14 +176,15 @@ class StatefulPage extends Mountable {
     router.post(path, async (ctx) => {
       const { action, state, inputs, action_args } = await this.extractState(ctx);
       if (action) {
-        const new_state = await this.actions[action](
+        const new_state = await this.actions[action]({
           ctx,
           state,
           inputs,
-          ...JSON.parse(
+          args: JSON.parse(
             from_base64(action_args)
-          )
-        );
+          ),
+          page: this
+        });
         ctx.body = this.render(ctx, new_state, inputs);
       } else {
         ctx.body = this.render(ctx, state, inputs);

package/lib/page/stateful-page.test.js

@@ -1,9 +1,16 @@
 import { tempstream } from "tempstream";
-import { StatefulPage } from "./stateful-page.js";
+import {
+  StatefulPage
+} from "./stateful-page.js";
 describe("stateful page", () => {
+  it("has types that allow for extracting action argument types", () => {
+    const action = async ({}) => {
+    };
+    const a = [2];
+  });
   it("handles a basic case with action buttons", () => {
     const actions = {
-      some_action: async (_ctx, _state, _inputs, _arg1) => {
+      some_action: async ({}) => {
       }
     };
     new class extends StatefulPage {

package/package.json

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

package/src/page/stateful-page.test.ts

@@ -1,17 +1,23 @@
 import { BaseContext } from "koa";
 import { Templatable, tempstream } from "tempstream";
-import { StatefulPage } from "./stateful-page.js";
+import {
+	ExtractStatefulPageActionArgs,
+	StatefulPage,
+	StatefulPageActionArgument,
+} from "./stateful-page.js";
 
 describe("stateful page", () => {
+	it("has types that allow for extracting action argument types", () => {
+		type TestState = {};
+		const action = async ({}: StatefulPageActionArgument<TestState, [number]>) => {};
+		type Args = ExtractStatefulPageActionArgs<typeof action>;
+		const a = [2] as Args; // should not throw a typescript error;
+	});
+
 	it("handles a basic case with action buttons", () => {
 		type TestState = {};
 		const actions = <const>{
-			some_action: async (
-				_ctx: BaseContext,
-				_state: TestState,
-				_inputs: Record<string, unknown>,
-				_arg1: number
-			) => {},
+			some_action: async ({}: StatefulPageActionArgument<TestState, [number]>) => {},
 		};
 		new (class extends StatefulPage<TestState, typeof actions> {
 			actions = actions;

package/src/page/stateful-page.ts

@@ -5,7 +5,6 @@ import deepmerge, { ArrayMergeOptions } from "deepmerge";
 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";
 
@@ -33,17 +32,32 @@ export type StateAndMetadata<State, Actions> =
 			$: Record<string, unknown>;
 	  };
 
+export type StatefulPageActionArgument<
+	State extends Record<string, unknown>,
+	Args extends unknown[] = unknown[]
+> = {
+	ctx: BaseContext;
+	state: State;
+	inputs: Record<string, string>;
+	args: Args;
+	page: StatefulPage<any, any>;
+};
+
+export type StatefulPageAction<
+	State extends Record<string, unknown>,
+	Args extends unknown[] = unknown[]
+> = (obj: StatefulPageActionArgument<State, Args>) => State | Promise<State>;
+
+export type ExtractStatefulPageActionArgs<X> = X extends StatefulPageAction<
+	any,
+	infer Args
+>
+	? Args
+	: never;
+
 export abstract class StatefulPage<
 	State extends Record<string, unknown>,
-	Actions extends Record<
-		string,
-		(
-			ctx: BaseContext,
-			state: State,
-			inputs: Record<string, string>,
-			...args: unknown[]
-		) => State | Promise<State>
-	>
+	Actions extends Record<string, StatefulPageAction<State>>
 > extends Mountable {
 	abstract actions: Actions;
 	abstract getInitialState(ctx: BaseContext): State | Promise<State>;
@@ -123,9 +137,7 @@ export abstract class StatefulPage<
 
 	makeActionURL<ActionName extends keyof Actions>(
 		action_description: StatefulPageActionDescription<ActionName>,
-		...args: ExtractTail<
-			ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>
-		>
+		...args: ExtractStatefulPageActionArgs<Actions[ActionName]>
 	) {
 		const { action } = this.extractActionAndLabel(action_description);
 		return `./?action=${action}&action_args=${encodeURIComponent(
@@ -137,9 +149,7 @@ export abstract class StatefulPage<
 	makeActionButton<ActionName extends keyof Actions>(
 		_state: State,
 		action_description: StatefulPageActionDescription<ActionName>,
-		...args: ExtractTail<
-			ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>
-		>
+		...args: ExtractStatefulPageActionArgs<Actions[ActionName]>
 	) {
 		const { label, content, disabled } =
 			this.extractActionAndLabel(action_description);
@@ -162,9 +172,7 @@ export abstract class StatefulPage<
 					label?: string;
 			  }
 			| ActionName,
-		...args: ExtractTail<
-			ExtractTail<ExtractTail<Parameters<Actions[ActionName]>>>
-		>
+		...args: ExtractStatefulPageActionArgs<Actions[ActionName]>
 	) {
 		return `(()=>{const form = this.closest('form'); form.action='${this.makeActionURL(
 			action_description,
@@ -301,14 +309,15 @@ export abstract class StatefulPage<
 			const { action, state, inputs, action_args } =
 				await this.extractState(ctx);
 			if (action) {
-				const new_state = await this.actions[action](
+				const new_state = await this.actions[action]({
 					ctx,
 					state,
 					inputs,
-					...(JSON.parse(
+					args: JSON.parse(
 						from_base64(action_args as string)
-					) as unknown[])
-				);
+					) as unknown[],
+					page: this,
+				});
 				ctx.body = this.render(ctx, new_state, inputs);
 			} else {
 				ctx.body = this.render(ctx, state, inputs);