@sealcode/sealgen 0.15.43 → 0.15.44

package/@types/src/components/toggle-modal.d.ts

@@ -1,7 +1,6 @@
-/// <reference types="node" resolution-mode="require"/>
 import { FlatTemplatable } from "tempstream";
 export declare function toggleModal(options: {
     name: string;
     contentWrapped: (id: string) => FlatTemplatable | Promise<FlatTemplatable>;
     contentUnwrapped: (id: string) => FlatTemplatable | Promise<FlatTemplatable>;
-}): import("stream").Readable;
+}): Promise<string>;

package/@types/src/forms/controls/array.d.ts

@@ -26,10 +26,10 @@ export declare class StructuredArray<Subfields extends Record<string, Field<any>
     getDefaultItemBody(): Promise<{}>;
     makeSubfield(_field_name: string): FormField;
     renderItemControl(ctx: Context, form_id: string, control: FormControl | UnboundControlStorage, item: FieldsetOutput<Subfields>, index: number): Promise<(string | number | import("stream").Readable | null) | (string | number | import("stream").Readable | null)[] | Promise<string | number | import("stream").Readable | null>[]>;
-    renderItem(ctx: Context, form_id: string, item: FieldsetOutput<Subfields>, index: number): Promise<import("stream").Readable>;
+    renderItem(ctx: Context, form_id: string, item: FieldsetOutput<Subfields>, index: number): Promise<string>;
     getItems(ctx: Context, raw_values: Record<string, FormDataValue>): Promise<FieldsetOutput<Subfields>[]>;
-    _render(ctx: Context, form_id: string, raw_values: Record<string, FormDataValue>): Promise<import("stream").Readable>;
-    render(fctx: FormControlContext): Promise<import("stream").Readable>;
+    _render(ctx: Context, form_id: string, raw_values: Record<string, FormDataValue>): Promise<string>;
+    render(fctx: FormControlContext): Promise<string>;
     getTargetItemID(ctx: Context): Promise<string>;
     mount(router: Router): void;
 }

package/@types/src/forms/controls/autocomplete.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { Context } from "koa";
 import { PickFromListField } from "../fields/pick-from-list.js";
 import { FormControlContext } from "./form-control.js";
@@ -19,5 +18,5 @@ export declare class Autocomplete extends SimpleInput<string | null> {
     getInputAttributes(fctx: FormControlContext): Promise<{
         list: string;
     }>;
-    postInput(ctx: Context): Promise<import("stream").Readable>;
+    postInput(ctx: Context): Promise<string>;
 }

package/@types/src/forms/controls/checkboxed-list-input.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { CheckboxedListField } from "../fields/checkboxed-list.js";
 import { FormControlContext } from "./form-control.js";
 import { FormFieldControl } from "./form-field-control.js";
@@ -10,5 +9,5 @@ export declare class CheckboxedListInput extends FormFieldControl {
     constructor(field: CheckboxedListField<boolean>, options?: {
         label: string;
     });
-    render(fctx: FormControlContext): Promise<import("stream").Readable>;
+    render(fctx: FormControlContext): Promise<string>;
 }

package/@types/src/forms/controls/collapsible-field-group.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { FlatTemplatable } from "tempstream";
 import { FieldGroup } from "./field-group.js";
 import { FormControl } from "./form-control.js";
@@ -15,7 +14,7 @@ export declare class CollapsibleFieldGroup extends FieldGroup {
     options: CollapsibleFieldGroupOptions;
     collapseID: string;
     constructor(controls: FormControl[], options?: CollapsibleFieldGroupOptions);
-    getGroupLabelProps(): import("stream").Readable;
+    getGroupLabelProps(): Promise<string>;
     preLabelContainer(): FlatTemplatable;
     postLabel(): FlatTemplatable;
 }

package/@types/src/forms/controls/derived-frame.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" resolution-mode="require"/>
-/// <reference types="node" resolution-mode="require"/>
 /// <reference types="koa__router" />
 import Router from "@koa/router";
 import { Context } from "koa";
@@ -17,6 +16,6 @@ export declare class DerivedFrame extends Derived<{
     generateFrameContent: (ctx: FormControlContext, args: ParsedUrlQuery) => Promise<FlatTemplatable>;
     frame_id: string;
     constructor(frame_name: string, fields: FormField[], generateFrameContent: (ctx: FormControlContext, args: ParsedUrlQuery) => Promise<FlatTemplatable>, frame_id?: string);
-    renderBackendResponseFrame(_ctx: Context, content: FlatTemplatable): import("stream").Readable;
+    renderBackendResponseFrame(_ctx: Context, content: FlatTemplatable): Promise<string>;
     mount(router: Router): void;
 }

package/@types/src/forms/controls/file.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
 import { Context } from "koa";
 import { FilePointer } from "@sealcode/file-manager";
 import { FlatTemplatable } from "tempstream";
@@ -9,6 +8,6 @@ import { SimpleInput } from "./simple-input.js";
 export declare class File extends SimpleInput<FileContainer> {
     getType(): string;
     renderFilePreview(_ctx: Context, file: FilePointer | null): Promise<FlatTemplatable>;
-    preInput(fctx: FormControlContext, data: Record<string, FormDataValue>): Promise<import("stream").Readable>;
+    preInput(fctx: FormControlContext, data: Record<string, FormDataValue>): Promise<string>;
     getInputAttributes(fctx: FormControlContext): Promise<Record<string, string | boolean>>;
 }

package/@types/src/forms/controls/multiple-files.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="koa__router" />
-/// <reference types="node" resolution-mode="require"/>
 import Router from "@koa/router";
 import { Collection, CollectionItem, Field as SealiousField } from "sealious";
 import { Context } from "koa";
@@ -23,7 +22,7 @@ export declare class MultipleFiles extends FormFieldControl {
     addFileAssociation(ctx: Context, file: FilePointer): Promise<void>;
     getFrameRelativeURL(): string;
     getFrameID(): string;
-    renderFrame(_ctx: Context, content?: FlatTemplatable): import("stream").Readable;
+    renderFrame(_ctx: Context, content?: FlatTemplatable): Promise<string>;
     render(fctx: FormControlContext): FlatTemplatable | Promise<FlatTemplatable>;
     getReferencingCollection(): Collection;
     getFileField(): SealiousField<any> | null;

package/@types/src/forms/controls/table.d.ts

@@ -8,7 +8,7 @@ import { Form } from "../form.js";
 import { FormControl, FormControlContext } from "./form-control.js";
 export type TableControlOptions<F extends Record<string, FormField>> = {
     render_fields: {
-        [field_name in keyof F]: (fctx: FormControlContext, name: string, value: string) => string;
+        [field_name in keyof F]: (fctx: FormControlContext, name: string, value: string) => FlatTemplatable | Promise<FlatTemplatable>;
     };
     allow_removing?: boolean;
     label_add?: string;

package/@types/src/utils/input-wrapper.d.ts

@@ -1,5 +1,3 @@
-/// <reference types="node" resolution-mode="require"/>
-import { Readable } from "stream";
 import { FlatTemplatable } from "tempstream";
 export declare function getRequiredClass(isRequired: boolean): string;
-export declare function inputWrapper(type: string, modifiers: string[], input: FlatTemplatable): Readable;
+export declare function inputWrapper(type: string, modifiers: string[], input: FlatTemplatable): Promise<string>;

package/lib/forms/controls/table.js

@@ -1,5 +1,6 @@
 import { hasShape, is, predicates } from "@sealcode/ts-predicates";
 import qs from "qs";
+import { tempstream } from "tempstream";
 import { FormControl } from "./form-control.js";
 class Table extends FormControl {
   constructor(table_field, options) {
@@ -16,79 +17,76 @@ class Table extends FormControl {
     if (!rows) {
       rows = [];
     }
-    return (
-      /* HTML */
-      `<turbo-frame
+    return tempstream`<turbo-frame
 			id="${this.getFrameID()}"
 			class="${[
-        "form-input__wrapper",
-        "form-input__wrapper--type--table",
-        "form-input__wrapper--options-count--" + rows.length.toString(),
-        ...rows.length >= 5 ? ["form-input__wrapper--options-count--5-or-more"] : [],
-        ...rows.length >= 10 ? ["form-input__wrapper--options-count--10-or-more"] : [],
-        ...rows.length >= 15 ? ["form-input__wrapper--options-count--15-or-more"] : [],
-        ...rows.length >= 20 ? ["form-input__wrapper--options-count--20-or-more"] : []
-      ].join(" ")}"
+      "form-input__wrapper",
+      "form-input__wrapper--type--table",
+      "form-input__wrapper--options-count--" + rows.length.toString(),
+      ...rows.length >= 5 ? ["form-input__wrapper--options-count--5-or-more"] : [],
+      ...rows.length >= 10 ? ["form-input__wrapper--options-count--10-or-more"] : [],
+      ...rows.length >= 15 ? ["form-input__wrapper--options-count--15-or-more"] : [],
+      ...rows.length >= 20 ? ["form-input__wrapper--options-count--20-or-more"] : []
+    ].join(" ")}"
 		>
 			<label>${this.options.label}</label>
 			<div class="table__wrapper">
 				<table>
 					<tbody>
 						${rows?.map((row, row_index) => {
-        return (
-          /* HTML */
-          `<tr>
+      return (
+        /* HTML */
+        tempstream`<tr>
 									${Object.entries(this.table_field.columns).map(([key]) => {
-            return `<td>${this.options.render_fields[key](
-              fctx,
-              `${this.table_field.name}[${row_index}][${key}]`,
-              // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-              row[key]
-            )}</td>`;
-          }).join("")}
+          return tempstream`<td>${this.options.render_fields[key](
+            fctx,
+            `${this.table_field.name}[${row_index}][${key}]`,
+            // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+            row[key]
+          )}</td>`;
+        })}
 									${this.options.allow_removing ? (
-            /* HTML */
-            `<td>
-												<input
-													type="submit"
-													data-turbo-frame="${this.getFrameID()}"
-													value="${this.options.label_remove || "remove"}"
-													form="${fctx.form_id}"
-													formnovalidate
-													formaction="${this.getActionURL(
-              this.table_field.name,
-              {
-                remove: {
-                  index: row_index
-                }
+          /* HTML */
+          `<td>
+													<input
+														type="submit"
+														data-turbo-frame="${this.getFrameID()}"
+														value="${this.options.label_remove || "remove"}"
+														form="${fctx.form_id}"
+														formnovalidate
+														formaction="${this.getActionURL(
+            this.table_field.name,
+            {
+              remove: {
+                index: row_index
               }
-            )}"
-												/>
-										  </td>`
-          ) : ""}
+            }
+          )}"
+													/>
+											  </td>`
+        ) : ""}
 								</tr>`
-        );
-      }).join("")}
+      );
+    })}
 					</tbody>
 				</table>
 				${this.options.allow_adding ? (
-        /* HTML */
-        `<input
+      /* HTML */
+      `<input
 							type="submit"
 							value="${this.options.label_add || "add"}"
 							form="${fctx.form_id}"
 							formnovalidate
 							formaction="${this.getActionURL(
-          this.table_field.name,
-          {
-            insert: { index: rows.length, value: {} }
-          }
-        )}"
+        this.table_field.name,
+        {
+          insert: { index: rows.length, value: {} }
+        }
+      )}"
 					  />`
-      ) : ""}
+    ) : ""}
 			</div>
-		</turbo-frame>`
-    );
+		</turbo-frame>`;
   }
   getFrameID() {
     return `array-frame-${this.table_field.name}`;
@@ -147,7 +145,7 @@ class Table extends FormControl {
       }
       ctx.override_reaction = {
         action: "stay",
-        content: form.render(
+        content: await form.render(
           ctx,
           {
             raw_values: await form.extractRawValues(ctx),

package/lib/templates/shared/handlers/file.js

@@ -9,7 +9,7 @@ const file_handler = async (_, { name, is_required }, importPath, { is_required_
     },
     field: `${name}: new Fields.File(${is_required_expr}, TheFileManager)`,
     initial_value_edit: `{old: item.get("${name}")}`,
-    pre_edit: `const ${tempname} = data.${name}.new || data.${name}.old;
+    pre_edit: `const ${tempname} = data.["${name}"]?.new || data.["${name}"]?.old;
 				if(!${tempname}){
 				    throw new Error("Missing field: ${name}")
          		}`,

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.15.43",
+	"version": "0.15.44",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"type": "module",
@@ -74,7 +74,7 @@
 		"prettier": "^2.7.1",
 		"prompts": "^2.4.2",
 		"recursive-readdir": "^2.2.3",
-		"tempstream": "^0.3.4",
+		"tempstream": "^0.4.0",
 		"tiny-glob": "^0.2.9",
 		"ws": "^8.16.0",
 		"yargs": "^17.6.2"

package/src/forms/controls/table.ts

@@ -5,7 +5,7 @@ import Router from "@koa/router";
 import { hasShape, is, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
 import qs from "qs";
-import { FlatTemplatable } from "tempstream";
+import { FlatTemplatable, tempstream } from "tempstream";
 import { FormField } from "../fields/field.js";
 import { Table as TableField } from "../fields/table.js";
 import { FormReaction } from "../form-types.js";
@@ -18,7 +18,7 @@ export type TableControlOptions<F extends Record<string, FormField>> = {
 			fctx: FormControlContext,
 			name: string,
 			value: string
-		) => string;
+		) => FlatTemplatable | Promise<FlatTemplatable>;
 	};
 	allow_removing?: boolean;
 	label_add?: string;
@@ -51,7 +51,7 @@ export class Table<F extends Record<string, FormField>> extends FormControl {
 		if (!rows) {
 			rows = [];
 		}
-		return /* HTML */ `<turbo-frame
+		return tempstream/* HTML */ `<turbo-frame
 			id="${this.getFrameID()}"
 			class="${[
 				"form-input__wrapper",
@@ -75,45 +75,44 @@ export class Table<F extends Record<string, FormField>> extends FormControl {
 			<div class="table__wrapper">
 				<table>
 					<tbody>
-						${rows
-							?.map((row, row_index) => {
-								return /* HTML */ `<tr>
-									${Object.entries(this.table_field.columns)
-										.map(([key]) => {
-											return `<td>${this.options.render_fields[
-												key
-											](
-												fctx,
-												`${this.table_field.name}[${row_index}][${key}]`,
-												// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-												row[key] as string
-											)}</td>`;
-										})
-										.join("")}
-									${this.options.allow_removing
-										? /* HTML */ `<td>
-												<input
-													type="submit"
-													data-turbo-frame="${this.getFrameID()}"
-													value="${this.options
-														.label_remove ||
-													"remove"}"
-													form="${fctx.form_id}"
-													formnovalidate
-													formaction="${this.getActionURL(
-														this.table_field.name,
-														{
-															remove: {
-																index: row_index,
-															},
-														}
-													)}"
-												/>
-										  </td>`
-										: ""}
+						${rows?.map((row, row_index) => {
+							return /* HTML */ tempstream`<tr>
+									${Object.entries(this.table_field.columns).map(([key]) => {
+										return tempstream`<td>${this.options.render_fields[
+											key
+										](
+											fctx,
+											`${this.table_field.name}[${row_index}][${key}]`,
+											// eslint-disable-next-line @typescript-eslint/consistent-type-assertions
+											row[key] as string
+										)}</td>`;
+									})}
+									${
+										this.options.allow_removing
+											? /* HTML */ `<td>
+													<input
+														type="submit"
+														data-turbo-frame="${this.getFrameID()}"
+														value="${this.options
+															.label_remove ||
+														"remove"}"
+														form="${fctx.form_id}"
+														formnovalidate
+														formaction="${this.getActionURL(
+															this.table_field
+																.name,
+															{
+																remove: {
+																	index: row_index,
+																},
+															}
+														)}"
+													/>
+											  </td>`
+											: ""
+									}
 								</tr>`;
-							})
-							.join("")}
+						})}
 					</tbody>
 				</table>
 				${this.options.allow_adding
@@ -202,7 +201,7 @@ export class Table<F extends Record<string, FormField>> extends FormControl {
 			}
 			ctx.override_reaction = {
 				action: "stay",
-				content: form.render(
+				content: await form.render(
 					ctx,
 					{
 						raw_values: await form.extractRawValues(ctx),

package/src/templates/shared/handlers/file.ts

@@ -17,7 +17,7 @@ export const file_handler: FieldHandler<
 		},
 		field: `${name}: new Fields.File(${is_required_expr}, TheFileManager)`,
 		initial_value_edit: `{old: item.get("${name}")}`,
-		pre_edit: `const ${tempname} = data.${name}.new || data.${name}.old;
+		pre_edit: `const ${tempname} = data.["${name}"]?.new || data.["${name}"]?.old;
 				if(!${tempname}){
 				    throw new Error("Missing field: ${name}")
          		}`,

package/src/utils/input-wrapper.ts

@@ -1,4 +1,3 @@
-import { Readable } from "stream";
 import { FlatTemplatable, tempstream } from "tempstream";
 
 export function getRequiredClass(isRequired: boolean): string {
@@ -13,7 +12,7 @@ export function inputWrapper(
 	type: string,
 	modifiers: string[],
 	input: FlatTemplatable
-): Readable {
+): Promise<string> {
 	return tempstream/* HTML */ `<div
 		class="form-input form-input--type-${type} form-input__wrapper ${getModifierClasses(
 			modifiers