@sealcode/sealgen 0.19.23 → 0.19.25-hotfix1

package/src/add-crud.ts

@@ -5,7 +5,6 @@ import { toKebabCase, toPascalCase } from "js-convert-case";
 import { listCollections } from "./utils/list-collections.js";
 import { collectionListTemplate } from "./templates/shared/collection-list.js";
 import { writeFile } from "./utils/write-file.js";
-import { curryImportPath, importPath } from "./utils/import-path.js";
 import { sharedCrudFormFields } from "./templates/shared/shared-crud-form-fields.js";
 import { generateRoutes } from "./generate-routes.js";
 import { createItemFormTemplate } from "./templates/shared/collection-create-form.js";
@@ -57,10 +56,7 @@ export async function addCRUD(
 		list_action_name,
 		list_path,
 		{
-			post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_action_name}URL } from "${importPath(
-				list_path,
-				"src/back/routes/urls.ts"
-			)}";`,
+			post_import_js: `import { ${create_action_name}URL, ${edit_action_name}URL, ${delete_action_name}URL } from "src/back/routes/urls.js";`,
 			post_header_html: `<a href={${create_action_name}URL}> Create </a>`,
 			render_item: (
 				collection_name: string
@@ -119,12 +115,10 @@ export async function addCRUD(
 	const delete_path = target_locreq.resolve(
 		`src/back/routes/${escape_url_params(url)}/[id]/delete.page.tsx`
 	);
-	const base_import_path = curryImportPath(delete_path);
 	const delete_content = await itemDeleteTemplate(
 		delete_action_name,
 		collection_name,
-		list_action_name,
-		base_import_path
+		list_action_name
 	);
 	await writeFile(delete_path, delete_content);
 

package/src/builders/backend-ts-builder.ts

@@ -22,6 +22,7 @@ export class BackendTSBuilder extends Builder {
 			!file_path.endsWith("src/back/collections/collections.ts") &&
 			!file_path.endsWith("src/back/routes/routes.ts") &&
 			!file_path.endsWith("src/back/routes/urls.ts") &&
+			!file_path.endsWith("src/back/jdd-components/components.ts") &&
 			!file_path.endsWith("stimulus.ts") &&
 			!file_path.startsWith("src/front")
 		);

package/src/forms/controls/textarea.ts

@@ -3,6 +3,7 @@ import { FormField } from "../fields/field.js";
 import { FormDataValue } from "../form-types.js";
 import { FormControlContext } from "./form-control.js";
 import { SimpleInput, SimpleInputOptions } from "./simple-input.js";
+import { htmlEscape } from "escape-goat";
 
 export class Textarea extends SimpleInput {
 	constructor(
@@ -19,11 +20,11 @@ export class Textarea extends SimpleInput {
 	}
 
 	renderDescription() {
-		return this.options.description
-			? /* HTML */ `<div class="form-input__description">
+		return this.options.description ?
+				/* HTML */ `<div class="form-input__description">
 					${this.options.description}
 				</div>`
-			: "";
+			:	"";
 	}
 
 	async getInputAttributes(
@@ -51,7 +52,7 @@ export class Textarea extends SimpleInput {
 	) {
 		const { parsed: value } = await this.field.getParsedValue(ctx, data);
 		return /* HTML */ `<textarea ${attributes}>
-${String(value) || ""}</textarea
+${htmlEscape(String(value)) || ""}</textarea
 		>`;
 	}
 }

package/src/templates/long-running-process.ts

@@ -1,16 +1,13 @@
 import { toSentenceCase } from "js-convert-case";
-import { curryImportPath } from "../utils/import-path.js";
 
 export async function LongRunningProcessTemplate(
-	action_name: string,
-	newfilefullpath: string
+	action_name: string
 ): Promise<string> {
-	const rel = curryImportPath(newfilefullpath);
 	return `import { Context } from "koa";
 import { TempstreamJSX } from "tempstream";
 import { Page } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 import { LongRunningProcess } from "sealious";
 
 export const actionName = "${action_name}";

package/src/templates/multiform.ts

@@ -1,12 +1,6 @@
-import { curryImportPath } from "../utils/utils.js";
-
-export async function multiformTemplate(
-	action_name: string,
-	newfilefullpath: string
-): Promise<string> {
-	const rel = curryImportPath(newfilefullpath);
+export async function multiformTemplate(action_name: string): Promise<string> {
 	return `import { Context } from "koa";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 import { Controls, Fields, Form, FormMessage, Multiform } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
 import { FlatTemplatable } from "tempstream";

package/src/templates/route-test.ts

@@ -1,16 +1,9 @@
-import { curryImportPath } from "../utils/import-path.js";
 import { formatWithPrettier } from "../utils/prettier.js";
 
-export async function testTemplate(
-	action_name: string,
-	new_file_fullpath: string
-) {
-	const rel = curryImportPath(new_file_fullpath);
-	const content = `import { withProdApp } from "${rel(
-		"src/back/test_utils/with-prod-app.js"
-	)}";
-import { ${action_name}URL } from "${rel("src/back/routes/urls.js")}";
-import { getBrowser } from "${rel("src/back/test_utils/browser-creator.js")}";
+export async function testTemplate(action_name: string) {
+	const content = `import { withProdApp } from ""src/back/test_utils/with-prod-app.js";
+	import { ${action_name}URL } from "src/back/routes/urls.js";
+	import { getBrowser } from "src/back/test_utils/browser-creator.js";
 import type { Browser, BrowserContext, Page } from "@playwright/test";
 
 describe("${action_name}", () => {

package/src/templates/shared/item-delete.ts

@@ -4,21 +4,16 @@ import { formatWithPrettier } from "../../utils/prettier.js";
 export function itemDeleteTemplate(
 	delete_action_name: string,
 	collection_name: string,
-	list_action_name: string,
-	importPath: (path: string) => string
+	list_action_name: string
 ): Promise<string> {
 	const result = `import type { Context } from "koa";
 import { Mountable } from "@sealcode/sealgen";
 import type Router from "@koa/router";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
 
-import { ${toPascalCase(collection_name)} } from "${importPath(
-		"src/back/collections/collections.js"
-	)}";
+import { ${toPascalCase(collection_name)} } from "src/back/collections/collections.js";
 
-import { ${list_action_name}URL } from "${importPath(
-		"src/back/routes/urls.js"
-	)}";
+import { ${list_action_name}URL } from "src/back/routes/urls.js";
 
 export const actionName = "${delete_action_name}";
 export const breadcrumbLabel: BreadcrumbLabel = "${delete_action_name}";

package/src/templates/stateful-page.ts

@@ -1,16 +1,13 @@
-import { curryImportPath } from "../utils/import-path.js";
 import { formatWithPrettier } from "../utils/prettier.js";
 
 export async function statefulPageTemplate(
-	action_name: string,
-	newfilefullpath: string
+	action_name: string
 ): Promise<string> {
-	const rel = curryImportPath(newfilefullpath);
 	return formatWithPrettier(`import { TempstreamJSX, Templatable } from "tempstream";
 import { Context } from "koa";
 import { StatefulPage, StatefulPageActionArgument } from "@sealcode/sealgen";
 import type { BreadcrumbLabel } from "@sealcode/sealgen";
-import html from "${rel("src/back/html.js")}";
+import html from "src/back/html.js";
 
 export const actionName = "${action_name}";
 export const breadcrumbLabel: BreadcrumbLabel = "${action_name}";