@sealcode/sealgen 0.7.8 → 0.7.10

package/@types/index.d.ts

@@ -19,3 +19,4 @@ export * from "./utils/translate";
 export * as sanitize from "./sanitize";
 export * from "./forms/multiform";
 export * as Components from "./components/components";
+export * from "./mount";

package/@types/mount.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="koa__router" />
+import Router from "@koa/router";
+import { Mountable } from "./page/mountable";
+export declare function mount(router: Router, url: string, mountable: Mountable): void;

package/lib/generate-routes.js

@@ -59,41 +59,14 @@ async function generateRoutes() {
     })));
     const routes_content = `// DO NOT EDIT! This file is generated automaticaly with npm run generate-routes
 
-import Koa, { Context } from "koa";
 import Router from "@koa/router";
-import { Middlewares } from "sealious";
-import { Mountable } from "@sealcode/sealgen";
+import { mount } from "@sealcode/sealgen";
 import * as URLs from "./urls"
 
 ${files
         .map(({ actionName, fullpath }) => `import { default as ${actionName} } from "${import_path_1.importPath(target_locreq.resolve("src/back/routes/routes.ts"), fullpath)}";`)
         .join("\n")}
 
-async function handleHtmlPromise(ctx: Context, next: Koa.Next) {
-	await next();
-	if (ctx.body instanceof Promise) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		ctx.body = await ctx.body;
-	}
-	ctx.set("content-type", "text/html;charset=utf-8");
-}
-
-function mount(router: Router, URL: string, mountable: Mountable) {
-	router.use(
-		URL,
-		Middlewares.extractContext(),
-		Middlewares.parseBody(),
-		handleHtmlPromise
-	);
-	mountable.init();
-	mountable.mount(router, URL);
-	// to automatically add trailing slashes:
-	router.get(URL.slice(0, -1), (ctx) => {
-		ctx.redirect(ctx.originalUrl + "/");
-	});
-	router.use(URL, (ctx) => ctx.set("content-type", "text/html;charset=utf-8"));
-}
-
 export default function mountAutoRoutes(router: Router) {
 ${files
         .map(({ actionName }) => `	mount(router, URLs.${actionName}URL, ${actionName});`)

package/lib/generate-routes.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-routes.js","sourceRoot":"","sources":["../src/generate-routes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate-routes.js","sourceRoot":"","sources":["../src/generate-routes.ts"],"names":[],"mappings":"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"}

package/lib/index.js

@@ -35,4 +35,5 @@ __exportStar(require("./utils/translate"), exports);
 exports.sanitize = __importStar(require("./sanitize"));
 __exportStar(require("./forms/multiform"), exports);
 exports.Components = __importStar(require("./components/components"));
+__exportStar(require("./mount"), exports);
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,sEAAsD;AACtD,+DAA+C;AAC/C,mDAAiC;AACjC,8CAA4B;AAC5B,+CAA6B;AAC7B,sDAAoC;AACpC,gDAA8B;AAC9B,8CAA4B;AAC5B,oDAAkC;AAClC,uDAAuC;AACvC,oDAAkC;AAClC,sEAAsD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;AAWA,sEAAsD;AACtD,+DAA+C;AAC/C,mDAAiC;AACjC,8CAA4B;AAC5B,+CAA6B;AAC7B,sDAAoC;AACpC,gDAA8B;AAC9B,8CAA4B;AAC5B,oDAAkC;AAClC,uDAAuC;AACvC,oDAAkC;AAClC,sEAAsD;AACtD,0CAAwB"}

package/lib/make-hidden-inputs.js

@@ -11,7 +11,7 @@ function makeHiddenInputs(ctx, fields, values, fields_to_skip) {
 				name="${key}"
 				value="${field
         .getValue(ctx, values)
-        .then((r) => sanitize_1.attribute(JSON.stringify(r.raw)))}"
+        .then((r) => sanitize_1.attribute(JSON.stringify(r.raw) || ""))}"
 			/>`)}`;
 }
 exports.makeHiddenInputs = makeHiddenInputs;

package/lib/make-hidden-inputs.js.map

@@ -1 +1 @@
-{"version":3,"file":"make-hidden-inputs.js","sourceRoot":"","sources":["../src/make-hidden-inputs.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAGzD,yCAAuC;AAEvC,SAAgB,gBAAgB,CAC/B,GAAY,EACZ,MAAiC,EACjC,MAAqC,EACrC,cAAwB;IAExB,OAAO,uBAAU,CAAA,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACxC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SAChD,GAAG,CACH,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,uBAAU,CAAA,UAAU,CAAC;;YAE9B,GAAG;aACF,KAAK;SACZ,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;SACrB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;MAC7C,CACH,EAAE,CAAC;AACN,CAAC;AAjBD,4CAiBC"}
+{"version":3,"file":"make-hidden-inputs.js","sourceRoot":"","sources":["../src/make-hidden-inputs.ts"],"names":[],"mappings":";;;AACA,2CAAyD;AAGzD,yCAAuC;AAEvC,SAAgB,gBAAgB,CAC/B,GAAY,EACZ,MAAiC,EACjC,MAAqC,EACrC,cAAwB;IAExB,OAAO,uBAAU,CAAA,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC;SACxC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,CAAC,cAAc,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;SAChD,GAAG,CACH,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,uBAAU,CAAA,UAAU,CAAC;;YAE9B,GAAG;aACF,KAAK;SACZ,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;SACrB,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,oBAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC,CAAC;MACnD,CACH,EAAE,CAAC;AACN,CAAC;AAjBD,4CAiBC"}

package/lib/mount.js

@@ -0,0 +1,26 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mount = void 0;
+const sealious_1 = require("sealious");
+async function handleHtmlPromise(ctx, next) {
+    await next();
+    if (ctx.body instanceof Promise) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        ctx.body = await ctx.body;
+    }
+    ctx.set("content-type", "text/html;charset=utf-8");
+}
+function mount(router, url, mountable) {
+    router.use(url, sealious_1.Middlewares.extractContext(), sealious_1.Middlewares.parseBody(), handleHtmlPromise);
+    mountable.init();
+    mountable.mount(router, url);
+    // to automatically add trailing slashes:
+    router.get(url.slice(0, -1), (ctx) => {
+        const url2 = new URL(url);
+        url2.pathname += "/";
+        ctx.redirect(url2.toString());
+    });
+    router.use(url, (ctx) => ctx.set("content-type", "text/html;charset=utf-8"));
+}
+exports.mount = mount;
+//# sourceMappingURL=mount.js.map

package/lib/mount.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mount.js","sourceRoot":"","sources":["../src/mount.ts"],"names":[],"mappings":";;;AAEA,uCAAuC;AAGvC,KAAK,UAAU,iBAAiB,CAAC,GAAY,EAAE,IAAc;IAC5D,MAAM,IAAI,EAAE,CAAC;IACb,IAAI,GAAG,CAAC,IAAI,YAAY,OAAO,EAAE;QAChC,mEAAmE;QACnE,GAAG,CAAC,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC;KAC1B;IACD,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAAC;AACpD,CAAC;AAED,SAAgB,KAAK,CAAC,MAAc,EAAE,GAAW,EAAE,SAAoB;IACtE,MAAM,CAAC,GAAG,CACT,GAAG,EACH,sBAAW,CAAC,cAAc,EAAE,EAC5B,sBAAW,CAAC,SAAS,EAAE,EACvB,iBAAiB,CACjB,CAAC;IACF,SAAS,CAAC,IAAI,EAAE,CAAC;IACjB,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC7B,yCAAyC;IACzC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,QAAQ,IAAI,GAAG,CAAC;QACrB,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;IAC/B,CAAC,CAAC,CAAC;IACH,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CACvB,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,yBAAyB,CAAC,CAClD,CAAC;AACH,CAAC;AAlBD,sBAkBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.7.8",
+	"version": "0.7.10",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"scripts": {
@@ -18,6 +18,7 @@
 	"devDependencies": {
 		"@types/koa__router": "^8.0.4",
 		"@types/mocha": "^9.0.0",
+		"@types/node": "^18.11.4",
 		"@types/prettier": "^2.7.0",
 		"@types/prompts": "^2.0.14",
 		"@typescript-eslint/eslint-plugin": "^4.29.3",

package/src/generate-routes.ts

@@ -53,10 +53,8 @@ export async function generateRoutes(): Promise<void> {
 
 	const routes_content = `// DO NOT EDIT! This file is generated automaticaly with npm run generate-routes
 
-import Koa, { Context } from "koa";
 import Router from "@koa/router";
-import { Middlewares } from "sealious";
-import { Mountable } from "@sealcode/sealgen";
+import { mount } from "@sealcode/sealgen";
 import * as URLs from "./urls"
 
 ${files
@@ -69,31 +67,6 @@ ${files
 	)
 	.join("\n")}
 
-async function handleHtmlPromise(ctx: Context, next: Koa.Next) {
-	await next();
-	if (ctx.body instanceof Promise) {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		ctx.body = await ctx.body;
-	}
-	ctx.set("content-type", "text/html;charset=utf-8");
-}
-
-function mount(router: Router, URL: string, mountable: Mountable) {
-	router.use(
-		URL,
-		Middlewares.extractContext(),
-		Middlewares.parseBody(),
-		handleHtmlPromise
-	);
-	mountable.init();
-	mountable.mount(router, URL);
-	// to automatically add trailing slashes:
-	router.get(URL.slice(0, -1), (ctx) => {
-		ctx.redirect(ctx.originalUrl + "/");
-	});
-	router.use(URL, (ctx) => ctx.set("content-type", "text/html;charset=utf-8"));
-}
-
 export default function mountAutoRoutes(router: Router) {
 ${files
 	.map(

package/src/index.ts

@@ -21,3 +21,4 @@ export * from "./utils/translate";
 export * as sanitize from "./sanitize";
 export * from "./forms/multiform";
 export * as Components from "./components/components";
+export * from "./mount";

package/src/make-hidden-inputs.ts

@@ -18,7 +18,7 @@ export function makeHiddenInputs(
 				name="${key}"
 				value="${field
 					.getValue(ctx, values)
-					.then((r) => attribute(JSON.stringify(r.raw)))}"
+					.then((r) => attribute(JSON.stringify(r.raw) || ""))}"
 			/>`
 		)}`;
 }

package/src/mount.ts

@@ -0,0 +1,33 @@
+import Router from "@koa/router";
+import Koa, { Context } from "koa";
+import { Middlewares } from "sealious";
+import { Mountable } from "./page/mountable";
+
+async function handleHtmlPromise(ctx: Context, next: Koa.Next) {
+	await next();
+	if (ctx.body instanceof Promise) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		ctx.body = await ctx.body;
+	}
+	ctx.set("content-type", "text/html;charset=utf-8");
+}
+
+export function mount(router: Router, url: string, mountable: Mountable): void {
+	router.use(
+		url,
+		Middlewares.extractContext(),
+		Middlewares.parseBody(),
+		handleHtmlPromise
+	);
+	mountable.init();
+	mountable.mount(router, url);
+	// to automatically add trailing slashes:
+	router.get(url.slice(0, -1), (ctx) => {
+		const url2 = new URL(url);
+		url2.pathname += "/";
+		ctx.redirect(url2.toString());
+	});
+	router.use(url, (ctx) =>
+		ctx.set("content-type", "text/html;charset=utf-8")
+	);
+}