@sealcode/sealgen 0.11.7 → 0.11.8

package/lib/build.js

@@ -38,6 +38,9 @@ const generate_collections_1 = require("./generate-collections");
 const generate_routes_1 = require("./generate-routes");
 const generate_components_1 = require("./generate-components");
 const notifier_1 = require("./notifier");
+const get_port_1 = __importDefault(require("get-port"));
+const locreq_1 = __importDefault(require("locreq"));
+const target_locreq = (0, locreq_1.default)(process.cwd());
 const generate_names = (function* generate_names() {
     const base_name = "____unique_import_";
     let count = 0;
@@ -46,6 +49,16 @@ const generate_names = (function* generate_names() {
         count++;
     }
 })();
+async function get_notifier_port() {
+    return (0, get_port_1.default)({ port: 4000 });
+}
+async function write_notifier_config(watch, port) {
+    const config = { watch };
+    if (port) {
+        config.port = port;
+    }
+    await fs_1.promises.writeFile(target_locreq.resolve("public/dist/notifier.json"), JSON.stringify(config));
+}
 async function build_ts() {
     await Promise.all([
         (0, generate_collections_1.generateCollections)(),
@@ -122,9 +135,12 @@ async function complex_build(watch) {
     });
     let ongoing_ts = false;
     let ongoing_css = false;
+    let ongoing_ts_promise = null;
     if (watch) {
         const watcher = chokidar.watch("src", { ignoreInitial: true });
-        const notifier = (0, notifier_1.make_notifier)(60808);
+        const port = await get_notifier_port();
+        const notifier = (0, notifier_1.make_notifier)(port);
+        await write_notifier_config(watch, port);
         watcher.on("all", async (_, path) => {
             if (!css_build)
                 return;
@@ -150,6 +166,9 @@ async function complex_build(watch) {
                         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                         .catch((e) => console.error(e?.message));
                 }
+                if (ongoing_ts_promise) {
+                    await ongoing_ts_promise;
+                }
                 notifier("css");
                 ongoing_css = false;
             }
@@ -161,12 +180,18 @@ async function complex_build(watch) {
                     return;
                 }
                 ongoing_ts = true;
-                await build_ts();
+                ongoing_ts_promise = build_ts();
+                await ongoing_ts_promise;
+                notifier("ts");
+                ongoing_ts_promise = null;
                 console.log(`Finished TS build [on ${path}]`);
                 ongoing_ts = false;
             }
         });
     }
+    else {
+        await write_notifier_config(watch);
+    }
     await (0, find_css_includes_1.generate_css_includes)();
     await Promise.all([css_build.rebuild(), build_ts()]);
     watch && css_build?.rebuild?.();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.11.7",
+	"version": "0.11.8",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"scripts": {
@@ -34,7 +34,7 @@
 		"eslint-config-prettier": "^8.3.0",
 		"eslint-plugin-prettier": "^3.4.1",
 		"eslint-plugin-with-tsc-error": "^0.0.7",
-		"get-port": "^5.0.0",
+		"get-port": "^5.1.1",
 		"koa-body": "^5.0.0",
 		"mocha": "^9.2.2",
 		"mri": "^1.2.0",

package/src/build.ts

@@ -9,6 +9,10 @@ import { generateCollections } from "./generate-collections";
 import { generateRoutes } from "./generate-routes";
 import { generateComponents } from "./generate-components";
 import { make_notifier } from "./notifier";
+import getPort from "get-port";
+
+import _locreq from "locreq";
+const target_locreq = _locreq(process.cwd());
 
 const generate_names = (function* generate_names() {
 	const base_name = "____unique_import_";
@@ -19,6 +23,21 @@ const generate_names = (function* generate_names() {
 	}
 })();
 
+async function get_notifier_port() {
+	return getPort({ port: 4000 });
+}
+
+async function write_notifier_config(watch: boolean, port?: number) {
+	const config = { watch } as Record<string, boolean | number>;
+	if (port) {
+		config.port = port;
+	}
+	await fs.writeFile(
+		target_locreq.resolve("public/dist/notifier.json"),
+		JSON.stringify(config)
+	);
+}
+
 async function build_ts() {
 	await Promise.all([
 		generateCollections(),
@@ -136,9 +155,12 @@ async function complex_build(watch: boolean): Promise<void> {
 	});
 	let ongoing_ts = false;
 	let ongoing_css = false;
+	let ongoing_ts_promise: Promise<any> | null = null;
 	if (watch) {
 		const watcher = chokidar.watch("src", { ignoreInitial: true });
-		const notifier = make_notifier(60808);
+		const port = await get_notifier_port();
+		const notifier = make_notifier(port);
+		await write_notifier_config(watch, port);
 		watcher.on("all", async (_, path) => {
 			if (!css_build) return;
 			if (path.includes(".#")) return;
@@ -161,6 +183,9 @@ async function complex_build(watch: boolean): Promise<void> {
 						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 						.catch((e) => console.error(e?.message));
 				}
+				if (ongoing_ts_promise) {
+					await ongoing_ts_promise;
+				}
 				notifier("css");
 				ongoing_css = false;
 			}
@@ -174,11 +199,16 @@ async function complex_build(watch: boolean): Promise<void> {
 					return;
 				}
 				ongoing_ts = true;
-				await build_ts();
+				ongoing_ts_promise = build_ts();
+				await ongoing_ts_promise;
+				notifier("ts");
+				ongoing_ts_promise = null;
 				console.log(`Finished TS build [on ${path}]`);
 				ongoing_ts = false;
 			}
 		});
+	} else {
+		await write_notifier_config(watch);
 	}
 	await generate_css_includes();