@sealcode/sealgen 0.11.8 → 0.12.2

package/src/build.ts

@@ -1,28 +1,19 @@
 import { build, BuildContext, BuildResult, context } from "esbuild";
 import { promises as fs } from "fs";
-import { extname } from "path";
 import * as chokidar from "chokidar";
 import { default as glob } from "tiny-glob";
-import { generate_css_includes } from "./find-css-includes";
-import { sleep } from "./utils/sleep";
-import { generateCollections } from "./generate-collections";
-import { generateRoutes } from "./generate-routes";
-import { generateComponents } from "./generate-components";
-import { make_notifier } from "./notifier";
+import { generate_css_includes } from "./find-css-includes.js";
+import { sleep } from "./utils/sleep.js";
+import { generateCollections } from "./generate-collections.js";
+import { generateRoutes } from "./generate-routes.js";
+import { generateComponents } from "./generate-components.js";
+import { make_notifier } from "./notifier.js";
 import getPort from "get-port";
+import { remove_named_imports } from "../remove-named-imports.js";
 
 import _locreq from "locreq";
 const target_locreq = _locreq(process.cwd());
 
-const generate_names = (function* generate_names() {
-	const base_name = "____unique_import_";
-	let count = 0;
-	while (true) {
-		yield `${base_name}${count}`;
-		count++;
-	}
-})();
-
 async function get_notifier_port() {
 	return getPort({ port: 4000 });
 }
@@ -58,79 +49,7 @@ async function build_ts() {
 			platform: "node",
 			target: "es2022",
 			format: "esm",
-			plugins: [
-				{
-					name: "remove-named-imports", // named imports sometime cause some esm incompatibilities, like the "is a CommonJS module, which may not support all module.exports as named exports." error
-					setup(build) {
-						build.onLoad({ filter: /.*/ }, async ({ path }) => {
-							const named_and_default_regex =
-								/^import\s+((\S+),\s+)?({\s*[^}]+})\s+from\s+("[^"]+");\s*$/gm;
-
-							const old_content = await fs.readFile(
-								path,
-								"utf-8"
-							);
-							const contents = old_content.replace(
-								named_and_default_regex,
-								(
-									_,
-									default_import_name,
-									__,
-									all_named,
-									module_path
-								) => {
-									/* eslint-disable */
-									const new_name =
-										generate_names.next().value;
-									const result =
-										`import * as ${new_name} from ${module_path}${
-											default_import_name
-												? `; const ${default_import_name.replace(
-														",",
-														""
-												  )} = ${new_name}.default || ${new_name};`
-												: ""
-										};` +
-										all_named
-											.match(/[a-zA-Z_$][^,}]+/g)
-											.map((importname: string) => {
-												if (
-													importname.startsWith(
-														"default as"
-													)
-												) {
-													return `const ${importname.replace(
-														"default as ",
-														""
-													)} = ${new_name}?.default || ${new_name};`;
-												}
-												if (
-													importname.match(
-														/([^{]*)\sas\s([^}]*)/
-													)
-												) {
-													// is "import {asdfas as somethong_else}
-													const [_, original, named] =
-														importname.match(
-															/([^{]*)\sas\s([^}]*)/
-														) as string[];
-													return `const named = ${new_name}?.default.${original} || ${new_name}?.${original}`;
-												}
-												return `const ${importname} = ${new_name}?.default?.${importname} || ${new_name}?.${importname};`;
-											})
-											.join(" ");
-									return result;
-									/* eslint-enable */
-								}
-							);
-							return {
-								contents,
-								loader: extname(path) === ".tsx" ? "tsx" : "ts",
-							};
-						});
-					},
-				},
-			],
+			plugins: [remove_named_imports],
 		});
 	} catch (e) {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -213,7 +132,11 @@ async function complex_build(watch: boolean): Promise<void> {
 	await generate_css_includes();
 
 	await Promise.all([css_build.rebuild(), build_ts()]);
-	watch && css_build?.rebuild?.();
+	if (watch) {
+		css_build?.rebuild?.();
+	} else {
+		css_build.dispose();
+	}
 }
 
 export async function buildProject({
@@ -234,5 +157,8 @@ export async function buildProject({
 		console.log("CAUGHT!");
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		console.error(e.message);
+		if (!watch) {
+			process.exit(1);
+		}
 	}
 }

package/src/cli.ts

@@ -1,13 +1,14 @@
 #!/usr/bin/env node
-import { addCollection } from "./add-collection";
-import { addJDDComponent } from "./add-jdd-component";
-import { addRoute } from "./add-route";
-import { buildProject } from "./build";
-import { generate_css_includes } from "./find-css-includes";
-import { generateCollections } from "./generate-collections";
-import { generateComponents } from "./generate-components";
-import { generateRoutes } from "./generate-routes";
-import { makeEnv } from "./make-env";
+import { addCollection } from "./add-collection.js";
+import { addJDDComponent } from "./add-jdd-component.js";
+import { addRoute } from "./add-route.js";
+import { buildProject } from "./build.js";
+import { generate_css_includes } from "./find-css-includes.js";
+import { generateCollections } from "./generate-collections.js";
+import { generateComponents } from "./generate-components.js";
+import { generateRoutes } from "./generate-routes.js";
+import { makeEnv } from "./make-env.js";
+import yargs from "yargs/yargs";
 
 const actions: Record<
 	string,
@@ -21,7 +22,7 @@ const actions: Record<
 	"generate-css-includes": generate_css_includes,
 	build: buildProject,
 	default: async function () {
-		console.log("Usage: `sealscript <action>`");
+		console.log("Usage: `npx sealgen <action>`");
 		console.log(
 			`Available actions: ${Object.keys(actions)
 				.filter((e) => e != "default")
@@ -29,12 +30,12 @@ const actions: Record<
 		);
 	},
 	"make-env": makeEnv,
-    "add-component": addJDDComponent
+	"add-component": addJDDComponent,
 };
 
 void (async function () {
 	const action = process.argv.at(2);
-	actions;
 	const fn = actions[action || "default"] || actions.default;
-	await fn(require("yargs").argv);
+	const args = yargs(process.argv).argv as Record<string, string | boolean>;
+	await fn(args);
 })();

package/src/components/components.ts

@@ -1,2 +1,2 @@
-export * from "./tabs";
-export * from "./toggle-modal";
+export * from "./tabs.js";
+export * from "./toggle-modal.js";

package/src/components/toggle-modal.ts

@@ -1,5 +1,5 @@
 import { FlatTemplatable, tempstream } from "tempstream";
-import { makeSlug } from "../utils/utils";
+import { makeSlug } from "../utils/utils.js";
 
 export function toggleModal(options: {
 	name: string;

package/src/find-css-includes.ts

@@ -1,7 +1,7 @@
 import { promises as fs } from "fs";
 import _locreq from "locreq";
 import { relative } from "path";
-import { walkDir } from "./utils/walk";
+import { walkDir } from "./utils/walk.js";
 
 const target_locreq = _locreq(process.cwd());
 

package/src/forms/controls/array.ts

@@ -4,12 +4,13 @@ import { Context } from "koa";
 import qs from "qs";
 import { Field, FieldsetOutput } from "sealious";
 import { tempstream } from "tempstream";
-import { Controls, Fields } from "../..";
-import { FormField, StructuredArrayField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormControl } from "./controls";
-import { FormControlContext } from "./form-control";
-import { FormFieldControl } from "./form-field-control";
+import { FormField } from "../fields/field.js";
+import { SimpleFormField } from "../fields/simple-form-field.js";
+import { StructuredArrayField } from "../fields/structured-array.js";
+import { FormDataValue } from "../form-types.js";
+import { Derived } from "./derived.js";
+import { FormControl, FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 
 export type UnboundControlStorage<
 	F extends { new (...args: any): FormFieldControl } = {
@@ -57,7 +58,7 @@ export class StructuredArray<
 
 	makeSubfield(_field_name: string): FormField {
 		const fields = this;
-		return new Fields.SimpleFormField(false);
+		return new SimpleFormField(false);
 	}
 
 	async renderItemControl(
@@ -87,7 +88,7 @@ export class StructuredArray<
 			await field.init(
 				`${this.field.name}[data][${index}][${field_name}]`
 			);
-			const hidden_shadow = new Controls.Derived(
+			const hidden_shadow = new Derived(
 				[field],
 				async (
 					values,

package/src/forms/controls/autocomplete.ts

@@ -1,8 +1,8 @@
 import { Context } from "koa";
-import { PickFromListField } from "../fields/pick-from-list";
-import { FormDataValue } from "../form";
-import { FormControlContext } from "./form-control";
-import { SimpleInput } from "./simple-input";
+import { PickFromListField } from "../fields/pick-from-list.js";
+import { FormDataValue } from "../form-types.js";
+import { FormControlContext } from "./form-control.js";
+import { SimpleInput } from "./simple-input.js";
 
 export class Autocomplete extends SimpleInput<string | null> {
 	constructor(

package/src/forms/controls/big-radio-group.ts

@@ -1,7 +1,7 @@
 import { FlatTemplatable, tempstream } from "tempstream";
-import { FormField } from "../fields/field";
-import { FormControlContext } from "./form-control";
-import { FormFieldControl } from "./form-field-control";
+import { FormField } from "../fields/field.js";
+import { FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 
 export class BigRadioGroup extends FormFieldControl {
 	constructor(

package/src/forms/controls/checkbox-group.ts

@@ -1,11 +1,12 @@
 import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
-import { EnumMultipleField, FormField } from "../fields/field";
-import { ProxyFormField } from "../fields/proxy-field";
-import { FormDataValue, FormMessage } from "../form";
-import { CheckboxWithValue } from "./checkbox";
-import { FieldGroup, FormFieldControl } from "./controls";
-import { FormControlContext } from "./form-control";
+import { EnumMultipleField } from "../fields/enum-multiple.js";
+import { FormField } from "../fields/field.js";
+import { ProxyFormField } from "../fields/proxy-field.js";
+import { CheckboxWithValue } from "./checkbox.js";
+import { FieldGroup } from "./field-group.js";
+import { FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 
 export type DefaultCheckboxOptions = {
 	id?: string;

package/src/forms/controls/checkbox.ts

@@ -1,7 +1,7 @@
 import { Context } from "koa";
-import { FormDataValue } from "../form";
-import { Tickable, TickableOptions } from "./tickable";
-import { FormField } from "../fields/field";
+import { FormDataValue } from "../form-types.js";
+import { Tickable, TickableOptions } from "./tickable.js";
+import { FormField } from "../fields/field.js";
 
 export class Checkbox extends Tickable<boolean> {
 	type = <const>"checkbox";

package/src/forms/controls/checkboxed-list-input.ts

@@ -1,11 +1,9 @@
 import { is, predicates } from "@sealcode/ts-predicates";
-import { Context } from "koa";
 import { tempstream } from "tempstream";
-import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper";
-import { ChekboxedListField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormFieldControl } from "./controls";
-import { FormControlContext } from "./form-control";
+import { getRequiredClass, inputWrapper } from "../../utils/input-wrapper.js";
+import { ChekboxedListField } from "../fields/checkboxed-list.js";
+import { FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 
 export class CheckboxedListInput extends FormFieldControl {
 	constructor(

package/src/forms/controls/collapsible-checkbox-group.ts

@@ -1,11 +1,8 @@
-import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
-import { FormDataValue, FormMessage } from "../form";
-import { CheckboxWithValue } from "./checkbox";
-import { FieldGroup, FormFieldControl } from "./controls";
-import { CheckboxGroup, DefaultCheckboxOptions } from "./checkbox-group";
-import { CollapsibleFieldGroup } from "./collapsible-field-group";
-import { FormControlContext } from "./form-control";
+import { CheckboxWithValue } from "./checkbox.js";
+import { CheckboxGroup, DefaultCheckboxOptions } from "./checkbox-group.js";
+import { CollapsibleFieldGroup } from "./collapsible-field-group.js";
+import { FormControlContext } from "./form-control.js";
 
 export class CollapsibleCheckboxGroup extends CheckboxGroup<
 	DefaultCheckboxOptions & {

package/src/forms/controls/collapsible-field-group.ts

@@ -1,7 +1,7 @@
 import { FlatTemplatable } from "tempstream";
-import { FieldGroup } from "./field-group";
+import { FieldGroup } from "./field-group.js";
 import { randomUUID } from "crypto";
-import { FormControl } from "./form-control";
+import { FormControl } from "./form-control.js";
 
 type CollapsibleFieldGroupOptions = {
 	label?: string;

package/src/forms/controls/controls.ts

@@ -1,30 +1,30 @@
-export { FormControl } from "./form-control";
-export { FormFieldControl } from "./form-field-control";
-export { EditableCollectionSubset } from "./editable-collection-subset";
-export { Frame } from "./frame";
-export { CheckboxedListInput } from "./checkboxed-list-input";
-export * from "./dropdown";
-export { SimpleInput } from "./simple-input";
-export { FormHeader } from "./form-header";
-export { FormParagraph } from "./form-paragraph";
-export { HTML } from "./html";
-export { HiddenInput } from "./hidden-input";
-export { Textarea } from "./textarea";
-export { FieldGroup } from "./field-group";
-export * from "./derived";
-export * from "./derived-frame";
-export * from "./tickable";
-export * from "./checkbox";
-export * from "./radio";
-export * from "./big-radio-group";
-export * from "./checkbox-group";
-export * from "./collapsible-field-group";
-export * from "./collapsible-checkbox-group";
-export * from "./autocomplete";
-export * from "./file";
-export * from "./photo";
-export * from "./multiple-files";
-export * from "./number";
-export * from "./multiple-photos";
+export { FormControl } from "./form-control.js";
+export { FormFieldControl } from "./form-field-control.js";
+export { EditableCollectionSubset } from "./editable-collection-subset.js";
+export { Frame } from "./frame.js";
+export { CheckboxedListInput } from "./checkboxed-list-input.js";
+export * from "./dropdown.js";
+export { SimpleInput } from "./simple-input.js";
+export { FormHeader } from "./form-header.js";
+export { FormParagraph } from "./form-paragraph.js";
+export { HTML } from "./html.js";
+export { HiddenInput } from "./hidden-input.js";
+export { Textarea } from "./textarea.js";
+export { FieldGroup } from "./field-group.js";
+export * from "./derived.js";
+export * from "./derived-frame.js";
+export * from "./tickable.js";
+export * from "./checkbox.js";
+export * from "./radio.js";
+export * from "./big-radio-group.js";
+export * from "./checkbox-group.js";
+export * from "./collapsible-field-group.js";
+export * from "./collapsible-checkbox-group.js";
+export * from "./autocomplete.js";
+export * from "./file.js";
+export * from "./photo.js";
+export * from "./multiple-files.js";
+export * from "./number.js";
+export * from "./multiple-photos.js";
 // export * from "./reverse-single-reference";
-export * from "./array";
+export * from "./array.js";

package/src/forms/controls/derived-frame.ts

@@ -3,10 +3,10 @@ import { hasShape, predicates } from "@sealcode/ts-predicates";
 import { Context } from "koa";
 import { ParsedUrlQuery } from "querystring";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { makeSlug } from "../../utils/make-slug";
-import { FormField } from "../fields/field";
-import { Derived } from "./derived";
-import { FormControlContext } from "./form-control";
+import { makeSlug } from "../../utils/make-slug.js";
+import { FormField } from "../fields/field.js";
+import { Derived } from "./derived.js";
+import { FormControlContext } from "./form-control.js";
 
 export class DerivedFrame extends Derived<{
 	frame_id: string;

package/src/forms/controls/derived.ts

@@ -1,8 +1,8 @@
 import { randomUUID } from "crypto";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { FormField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormControl, FormControlContext } from "./form-control";
+import { FormField } from "../fields/field.js";
+import { FormDataValue } from "../form-types.js";
+import { FormControl, FormControlContext } from "./form-control.js";
 
 export class Derived<
 	Consts extends Record<string, unknown | undefined>

package/src/forms/controls/dropdown.ts

@@ -1,10 +1,11 @@
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { attribute } from "../../sanitize";
-import { FormField, PickFromListField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormControlContext } from "./form-control";
-import { SimpleInput } from "./simple-input";
+import { attribute } from "../../sanitize.js";
+import { FormField } from "../fields/field.js";
+import { PickFromListField } from "../fields/pick-from-list.js";
+import { FormDataValue } from "../form-types.js";
+import { FormControlContext } from "./form-control.js";
+import { SimpleInput } from "./simple-input.js";
 
 export type DropdownOptions = {
 	label: string;

package/src/forms/controls/editable-collection-subset.ts

@@ -1,8 +1,8 @@
 import { FlatTemplatable, tempstream } from "tempstream";
-import { attribute } from "../../sanitize";
-import { PickFromListField } from "../fields/field";
-import { FormFieldControl } from "./controls";
-import { FormControlContext } from "./form-control";
+import { attribute } from "../../sanitize.js";
+import { PickFromListField } from "../fields/pick-from-list.js";
+import { FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 
 /**
  * This control has own forms in it so if you want to use it you

package/src/forms/controls/field-group.ts

@@ -1,8 +1,6 @@
-import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { FormDataValue, FormMessage } from "../form";
-import { FormControl, FormControlContext } from "./form-control";
-import { FormFieldControl } from "./form-field-control";
+import { FormControl, FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 
 export class FieldGroup extends FormFieldControl {
 	constructor(

package/src/forms/controls/file.ts

@@ -1,9 +1,9 @@
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { FileContainer } from "../fields/file";
-import { FormDataValue } from "../form";
-import { FormControlContext } from "./form-control";
-import { SimpleInput } from "./simple-input";
+import { FileContainer } from "../fields/file.js";
+import { FormDataValue } from "../form-types.js";
+import { FormControlContext } from "./form-control.js";
+import { SimpleInput } from "./simple-input.js";
 
 export class File extends SimpleInput<FileContainer> {
 	getType() {

package/src/forms/controls/form-control.ts

@@ -1,7 +1,7 @@
 import Router from "@koa/router";
 import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
-import { FormDataValue, FormMessage } from "../form";
+import { FormDataValue, FormMessage } from "../form-types.js";
 
 export class FormControlContext {
 	constructor(

package/src/forms/controls/form-field-control.ts

@@ -1,8 +1,7 @@
-import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
-import { FormField } from "../fields/field";
-import { FieldValueType, FormDataValue } from "../form";
-import { FormControl, FormControlContext } from "./form-control";
+import { FormField } from "../fields/field.js";
+import { FieldValueType } from "../form-types.js";
+import { FormControl, FormControlContext } from "./form-control.js";
 
 export type FormFieldsToTypes<FormFields extends readonly FormField[]> = {
 	[Index in keyof FormFields]: FormFields[Index] extends FormField

package/src/forms/controls/form-header.ts

@@ -1,6 +1,4 @@
-import { Context } from "koa";
-import { FormControl } from "./controls";
-import { FormControlContext } from "./form-control";
+import { FormControl, FormControlContext } from "./form-control.js";
 
 export class FormHeader extends FormControl {
 	role = <const>"decoration";

package/src/forms/controls/form-paragraph.ts

@@ -1,4 +1,4 @@
-import { FormControl } from "./controls";
+import { FormControl } from "./form-control.js";
 
 export class FormParagraph extends FormControl {
 	role = <const>"decoration";

package/src/forms/controls/frame.ts

@@ -1,5 +1,5 @@
-import { FlatTemplatable, Templatable } from "tempstream";
-import { FormControl } from "./controls";
+import { FlatTemplatable } from "tempstream";
+import { FormControl } from "./form-control.js";
 
 /**
  * This class will render `turbo-frame` tag so that u can

package/src/forms/controls/hidden-input.ts

@@ -1,10 +1,10 @@
 import { Context } from "koa";
 import { FlatTemplatable, tempstream } from "tempstream";
-import { attribute } from "../../sanitize";
-import { FormField } from "../fields/field";
-import { FormDataValue } from "../form";
-import { FormControlContext } from "./form-control";
-import { FormFieldControl } from "./form-field-control";
+import { attribute } from "../../sanitize.js";
+import { FormField } from "../fields/field.js";
+import { FormDataValue } from "../form-types.js";
+import { FormControlContext } from "./form-control.js";
+import { FormFieldControl } from "./form-field-control.js";
 
 export class HiddenInput extends FormFieldControl {
 	constructor(public field: FormField) {

package/src/forms/controls/html.ts

@@ -1,8 +1,5 @@
-import { Context } from "koa";
 import { FlatTemplatable } from "tempstream";
-import { FormDataValue, FormMessage } from "../form";
-import { FormControl } from "./controls";
-import { FormControlContext } from "./form-control";
+import { FormControl, FormControlContext } from "./form-control.js";
 
 type Renderer =
 	| ((fctx: FormControlContext) => FlatTemplatable)