@sealcode/sealgen 0.14.8 → 0.14.10

package/dist/templates/collection.js

@@ -1,6 +1,5 @@
 function collectionTemplate(collection_name) {
-  return `import type { App, Policy } from "sealious";
-import { Collection, FieldTypes, Policies } from "sealious";
+  return `import { Collection, FieldTypes, Policies } from "sealious";
 
 export default class ${collection_name} extends Collection {
 	fields = {

package/dist/templates/form.js

@@ -1,15 +1,9 @@
 import { curryImportPath } from "../utils/import-path.js";
 async function formTemplate(action_name, newfilefullpath) {
   const rel = curryImportPath(newfilefullpath);
-  return `import { Context } from "koa";
-import {
-	Form,
-	FormData,
-	FormDataValue,
-	Fields,
-	Controls,
-	fieldsToShape,
-} from "@sealcode/sealgen";
+  return `import type { Context } from "koa";
+import type { FormData, FormDataValue } from "@sealcode/sealgen";
+import { Form, Fields, Controls, fieldsToShape } from "@sealcode/sealgen";
 import html from "${rel("src/back/html.js")}";
 import { Users } from "${rel("src/back/collections/collections.js")}";
 
@@ -20,7 +14,7 @@ const fields = {
 	password: new Fields.SimpleFormField(true),
 };
 
-export const ${action_name}Shape = Fields.fieldsToShape(fields);
+export const ${action_name}Shape = fieldsToShape(fields);
 
 export default new (class ${action_name}Form extends Form<typeof fields, void> {
 	defaultSuccessMessage = "Formularz wype\u0142niony poprawnie";
@@ -28,7 +22,10 @@ export default new (class ${action_name}Form extends Form<typeof fields, void> {
 
 	controls = [
 		new Controls.SimpleInput(fields.email, { label: "Email:", type: "email" }),
-		new Controls.SimpleInput(fields.password, { label: "Password:", type: "password" }),
+		new Controls.SimpleInput(fields.password, {
+			label: "Password:",
+			type: "password",
+		}),
 	];
 
 	async validateValues(

package/dist/utils/extract-fields-from-collection.js

@@ -1,13 +1,10 @@
 import _locreq from "locreq";
-import { curryImportPath, exec } from "./utils.js";
+import { exec } from "./utils.js";
 const target_locreq = _locreq(process.cwd());
 import { promises as fs } from "fs";
 async function extract_fields_from_collection(collection_name) {
-  const rel = curryImportPath(target_locreq.resolve("dist/back"));
-  const extractor_code = `import {default as Collection} from "${rel(
-    `./back/collections/${collection_name}.js`
-  )}";
-const c = new Collection();
+  const extractor_code = `import {default as the_app} from "./app.js";
+const c = new the_app().collections["${collection_name}"];
 const fields = [];
 for (const field_name in c.fields){
     const field = c.fields[field_name];

package/package.json

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

package/src/templates/collection.ts

@@ -1,6 +1,5 @@
 export function collectionTemplate(collection_name: string) {
-	return `import type { App, Policy } from "sealious";
-import { Collection, FieldTypes, Policies } from "sealious";
+	return `import { Collection, FieldTypes, Policies } from "sealious";
 
 export default class ${collection_name} extends Collection {
 	fields = {

package/src/templates/form.ts

@@ -5,15 +5,9 @@ export async function formTemplate(
 	newfilefullpath: string
 ): Promise<string> {
 	const rel = curryImportPath(newfilefullpath);
-	return `import { Context } from "koa";
-import {
-	Form,
-	FormData,
-	FormDataValue,
-	Fields,
-	Controls,
-	fieldsToShape,
-} from "@sealcode/sealgen";
+	return `import type { Context } from "koa";
+import type { FormData, FormDataValue } from "@sealcode/sealgen";
+import { Form, Fields, Controls, fieldsToShape } from "@sealcode/sealgen";
 import html from "${rel("src/back/html.js")}";
 import { Users } from "${rel("src/back/collections/collections.js")}";
 
@@ -24,7 +18,7 @@ const fields = {
 	password: new Fields.SimpleFormField(true),
 };
 
-export const ${action_name}Shape = Fields.fieldsToShape(fields);
+export const ${action_name}Shape = fieldsToShape(fields);
 
 export default new (class ${action_name}Form extends Form<typeof fields, void> {
 	defaultSuccessMessage = "Formularz wypełniony poprawnie";
@@ -32,7 +26,10 @@ export default new (class ${action_name}Form extends Form<typeof fields, void> {
 
 	controls = [
 		new Controls.SimpleInput(fields.email, { label: "Email:", type: "email" }),
-		new Controls.SimpleInput(fields.password, { label: "Password:", type: "password" }),
+		new Controls.SimpleInput(fields.password, {
+			label: "Password:",
+			type: "password",
+		}),
 	];
 
 	async validateValues(

package/src/utils/extract-fields-from-collection.ts

@@ -1,16 +1,13 @@
 import _locreq from "locreq";
-import { curryImportPath, exec } from "./utils.js";
+import { exec } from "./utils.js";
 const target_locreq = _locreq(process.cwd());
 import { promises as fs } from "fs";
 
 export default async function extract_fields_from_collection(
 	collection_name: string
 ): Promise<{ name: string; type: string }[]> {
-	const rel = curryImportPath(target_locreq.resolve("dist/back"));
-	const extractor_code = `import {default as Collection} from "${rel(
-		`./back/collections/${collection_name}.js`
-	)}";
-const c = new Collection();
+	const extractor_code = `import {default as the_app} from "./app.js";
+const c = new the_app().collections["${collection_name}"];
 const fields = [];
 for (const field_name in c.fields){
     const field = c.fields[field_name];