@sealcode/sealgen 0.15.31 → 0.15.33

package/@types/src/add-crud.d.ts

@@ -0,0 +1,3 @@
+export declare function addCRUD(params: Partial<{
+    [key in "collection" | "url"]: string;
+}>, app_directory?: string): Promise<void>;

package/@types/src/page/mountable-with-fields.d.ts

@@ -10,6 +10,8 @@ export type PageErrorMessage = {
     message: string;
 };
 export type Fields = Record<string, FormField<boolean, any>>;
+type Resolved<T> = T extends Promise<infer X> ? X : never;
+type ParsedValue<T extends FormField> = Resolved<ReturnType<T["getValue"]>>["parsed"];
 export declare abstract class MountableWithFields<F extends Fields = Fields> extends Mountable {
     fields: F;
     field_names_prefix: string;
@@ -32,6 +34,9 @@ export declare abstract class MountableWithFields<F extends Fields = Fields> ext
     renderError(_: Context, error: PageErrorMessage): Promise<FlatTemplatable>;
     renderMessages(_: Context, data: FormData<keyof Fields>): FlatTemplatable;
     abstract extractRawValues(ctx: Context): Promise<Record<string, FormDataValue>>;
-    getParsedValues(ctx: Context): Promise<ShapeToType<FieldsToShape<F>>>;
+    getParsedValues(ctx: Context): Promise<{
+        [field in keyof F]: F[field] extends FormField<true> ? Exclude<ParsedValue<F[field]>, null> : ParsedValue<F[field]>;
+    }>;
     getDatabaseValues(ctx: Context): Promise<ShapeToType<FieldsToShape<F>>>;
 }
+export {};

package/@types/src/page/mountable-with-fields.test.d.ts

@@ -0,0 +1 @@
+export {};

package/@types/src/templates/shared/collection-create-form.d.ts

@@ -0,0 +1 @@
+export declare function createItemFormTemplate(create_action_name: string, newfilefullpath: string, collection_name: string, list_action: string): Promise<string>;

package/@types/src/templates/shared/collection-list.d.ts

@@ -0,0 +1,15 @@
+export declare function makeDefaultFilterFields(collection_fields: {
+    name: string;
+    type: string;
+}[]): string;
+export declare function makeDefaultDisplayFields(collection_fields: {
+    name: string;
+    type: string;
+}[]): string;
+declare const default_hooks: {
+    pre_header_html: string;
+    post_header_html: string;
+    post_import_js: string;
+};
+export declare function collectionListTemplate(collection_name: string, action_name: string, newfilefullpath: string, _hooks?: Partial<typeof default_hooks>): Promise<string>;
+export {};

package/@types/src/templates/shared/shared-crud-form-fields.d.ts

@@ -0,0 +1 @@
+export declare function sharedCrudFormFields(collection_name: string, newfilefullpath: string): Promise<string>;

package/@types/src/utils/write-file.d.ts

@@ -0,0 +1 @@
+export declare function writeFile(path: string, content: string): Promise<void>;

package/lib/page/mountable-with-fields.test.js

@@ -0,0 +1,29 @@
+import { Form } from "../forms/form.js";
+import { FieldTypes } from "sealious";
+import { CollectionField } from "../forms/fields/collection-field.js";
+describe("mountable-with-fields", () => {
+  it("properly types the getParsedValues method and respects required status", () => {
+    const fields = {
+      not_required: new CollectionField(false, new FieldTypes.Text()),
+      required: new CollectionField(true, new FieldTypes.Text())
+    };
+    new class extends Form {
+      constructor() {
+        super(...arguments);
+        this.fields = fields;
+        this.controls = [];
+      }
+      async onSubmit(ctx, form_values) {
+        const data = await this.getParsedValues(ctx);
+        data.not_required?.trim();
+        data.required.trim();
+        const { parsed: data2 } = await this.fields.not_required.getValue(
+          ctx,
+          form_values.raw_values
+        );
+        data2?.trim();
+      }
+    }();
+  });
+});
+//# sourceMappingURL=mountable-with-fields.test.js.map

package/lib/templates/list.js

@@ -29,7 +29,7 @@ const listTemplate = async (action_name, newfilefullpath) => {
   ]);
   const importPath = curryImportPath(newfilefullpath);
   const result = `import type { Context } from "koa";
-import type { CollectionItem } from "sealious";
+import type { CollectionItem, ItemListResult } from "sealious";
 import type { FlatTemplatable } from "tempstream";
 import { TempstreamJSX } from "tempstream";
 import { ${uppercase_collection} } from "${importPath(
@@ -98,7 +98,7 @@ ${collection_fields.map((field) => {
 ] as {
 	field: string;
 	label: string;
-	format?: (value: unknown) => FlatTemplatable;
+	format?: (value: unknown, item: CollectionItem<typeof Opinions>) => FlatTemplatable;
 }[];
 
 export default new (class ${action_name}Page extends SealiousItemListPage<
@@ -152,7 +152,7 @@ async getFilterValues(ctx: Context) {
 			{displayFields.map(({ field, format }) => {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
 				const value = item.get(field as any);
-				return <td>{format ? format(value) : value}</td>;
+				return <td>{format ? format(value, item) : value}</td>;
 			})}
 		</tr>;
 }

package/package.json

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

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

@@ -36,7 +36,7 @@ export class CollectionField<
 			encoded_value,
 			null,
 			{}
-		)) as Depromisify<ReturnType<F["encode"]>>;
+		)) as ExtractFieldDecoded<F>;
 		return {
 			parsable: true,
 			error: null,

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

@@ -0,0 +1,30 @@
+import type { Context } from "koa";
+import { Form } from "../forms/form.js";
+import { FieldTypes } from "sealious";
+import { CollectionField } from "../forms/fields/collection-field.js";
+import { FormData } from "../forms/form-types.js";
+
+describe("mountable-with-fields", () => {
+	it("properly types the getParsedValues method and respects required status", () => {
+		const fields = {
+			not_required: new CollectionField(false, new FieldTypes.Text()),
+			required: new CollectionField(true, new FieldTypes.Text()),
+		};
+		new (class extends Form<typeof fields, void> {
+			fields = fields;
+			controls = [];
+			async onSubmit(ctx: Context, form_values: FormData) {
+				const data = await this.getParsedValues(ctx);
+				// this should not throw a Typescript error
+				data.not_required?.trim();
+				// this should work without the optional chaining:
+				data.required.trim();
+				const { parsed: data2 } = await this.fields.not_required.getValue(
+					ctx,
+					form_values.raw_values
+				);
+				data2?.trim();
+			}
+		})();
+	});
+});

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

@@ -18,6 +18,11 @@ 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>>;
 
+type Resolved<T> = T extends Promise<infer X> ? X : never;
+type ParsedValue<T extends FormField> = Resolved<
+	ReturnType<T["getValue"]>
+>["parsed"];
+
 export abstract class MountableWithFields<
 	F extends Fields = Fields
 > extends Mountable {
@@ -134,9 +139,11 @@ export abstract class MountableWithFields<
 		ctx: Context
 	): Promise<Record<string, FormDataValue>>;
 
-	async getParsedValues(
-		ctx: Context
-	): Promise<ShapeToType<FieldsToShape<F>>> {
+	async getParsedValues(ctx: Context): Promise<{
+		[field in keyof F]: F[field] extends FormField<true>
+			? Exclude<ParsedValue<F[field]>, null>
+			: ParsedValue<F[field]>;
+	}> {
 		const raw_values = await this.extractRawValues(ctx);
 		const result: Record<string, unknown> = {};
 		const promises = Object.entries(this.fields).map(
@@ -147,7 +154,9 @@ export abstract class MountableWithFields<
 			}
 		);
 		await Promise.all(promises);
-		return result as ShapeToType<FieldsToShape<F>>;
+		// TODO: remove this any. I don't have the strenght to deal with it now.
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
+		return result as any;
 	}
 
 	async getDatabaseValues(

package/src/templates/list.ts

@@ -35,7 +35,7 @@ export const listTemplate = async (
 	]);
 	const importPath = curryImportPath(newfilefullpath);
 	const result = `import type { Context } from "koa";
-import type { CollectionItem } from "sealious";
+import type { CollectionItem, ItemListResult } from "sealious";
 import type { FlatTemplatable } from "tempstream";
 import { TempstreamJSX } from "tempstream";
 import { ${uppercase_collection} } from "${importPath(
@@ -113,7 +113,7 @@ ${collection_fields
 ] as {
 	field: string;
 	label: string;
-	format?: (value: unknown) => FlatTemplatable;
+	format?: (value: unknown, item: CollectionItem<typeof Opinions>) => FlatTemplatable;
 }[];
 
 export default new (class ${action_name}Page extends SealiousItemListPage<
@@ -167,7 +167,7 @@ async getFilterValues(ctx: Context) {
 			{displayFields.map(({ field, format }) => {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/consistent-type-assertions, @typescript-eslint/no-explicit-any
 				const value = item.get(field as any);
-				return <td>{format ? format(value) : value}</td>;
+				return <td>{format ? format(value, item) : value}</td>;
 			})}
 		</tr>;
 }