@sealcode/sealgen 0.11.5 → 0.11.7

package/@types/notifier.d.ts

@@ -0,0 +1 @@
+export declare function make_notifier(port: number): (message: string) => void;

package/lib/build.js

@@ -37,6 +37,7 @@ const sleep_1 = require("./utils/sleep");
 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 generate_names = (function* generate_names() {
     const base_name = "____unique_import_";
     let count = 0;
@@ -110,7 +111,6 @@ async function build_ts() {
 }
 async function complex_build(watch) {
     const loader = Object.fromEntries(["png", "svg", "jpg", "gif", "jpeg", "otf", "ttf"].map((ext) => ["." + ext, "file"]));
-    console.log({ loader });
     let css_build = await (0, esbuild_1.context)({
         entryPoints: ["./src/main.css"],
         sourcemap: true,
@@ -124,6 +124,7 @@ async function complex_build(watch) {
     let ongoing_css = false;
     if (watch) {
         const watcher = chokidar.watch("src", { ignoreInitial: true });
+        const notifier = (0, notifier_1.make_notifier)(60808);
         watcher.on("all", async (_, path) => {
             if (!css_build)
                 return;
@@ -149,6 +150,7 @@ async function complex_build(watch) {
                         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                         .catch((e) => console.error(e?.message));
                 }
+                notifier("css");
                 ongoing_css = false;
             }
             if ((path.endsWith(".ts") || path.endsWith(".tsx")) &&

package/lib/notifier.js

@@ -0,0 +1,26 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.make_notifier = void 0;
+const ws_1 = __importDefault(require("ws"));
+function make_notifier(port) {
+    const server = new ws_1.default.Server({
+        port,
+    });
+    let sockets = [];
+    server.on("connection", function (socket) {
+        sockets.push(socket);
+        // When a socket closes, or disconnects, remove it from the array.
+        socket.on("close", function () {
+            sockets = sockets.filter((s) => s !== socket);
+        });
+    });
+    console.log("build notifier listening on websocket at port " + port);
+    return function notify(message) {
+        sockets.forEach((s) => s.send(message));
+    };
+}
+exports.make_notifier = make_notifier;
+//# sourceMappingURL=notifier.js.map

package/lib/page/stateful-page.js

@@ -62,22 +62,9 @@ class StatefulPage extends mountable_1.Mountable {
         // the "$" key is parsed as dot notation and overrides the state
         const original_state = JSON.parse((0, base64_1.from_base64)(ctx.$body.state));
         const modified_state = (0, deepmerge_1.default)(original_state, ctx.$body.$ || {}, {
-            arrayMerge: (target, source, options) => {
+            arrayMerge: (_target, source, _options) => {
                 // https://github.com/TehShrike/deepmerge#user-content-arraymerge-example-combine-arrays
-                const destination = target.slice();
-                source.forEach((item, index) => {
-                    if (typeof destination[index] === "undefined") {
-                        destination[index] =
-                            options.cloneUnlessOtherwiseSpecified(item, options);
-                    }
-                    else if (options.isMergeableObject(item)) {
-                        destination[index] = (0, deepmerge_1.default)(target[index], item, options);
-                    }
-                    else if (target.indexOf(item) === -1) {
-                        destination.push(item);
-                    }
-                });
-                return destination;
+                return source;
             },
         });
         if (ctx.$body.action && ctx.$body.args) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@sealcode/sealgen",
-	"version": "0.11.5",
+	"version": "0.11.7",
 	"description": "Module to automate adding routes and collections to a sealious application",
 	"main": "lib/index.js",
 	"scripts": {
@@ -27,6 +27,7 @@
 		"@types/prettier": "^2.7.0",
 		"@types/prompts": "^2.0.14",
 		"@types/recursive-readdir": "^2.2.4",
+		"@types/ws": "^8.5.10",
 		"@typescript-eslint/eslint-plugin": "^4.29.3",
 		"@typescript-eslint/parser": "^4.29.3",
 		"eslint": "^7.32.0",
@@ -60,6 +61,7 @@
 		"recursive-readdir": "^2.2.3",
 		"tempstream": "^0.3.0",
 		"tiny-glob": "^0.2.9",
+		"ws": "^8.16.0",
 		"yargs": "^17.6.2"
 	},
 	"peerDependencies": {

package/src/build.ts

@@ -8,6 +8,7 @@ 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";
 
 const generate_names = (function* generate_names() {
 	const base_name = "____unique_import_";
@@ -124,7 +125,6 @@ async function complex_build(watch: boolean): Promise<void> {
 			(ext) => <const>["." + ext, "file"]
 		)
 	);
-	console.log({ loader });
 	let css_build: BuildContext = await context({
 		entryPoints: ["./src/main.css"],
 		sourcemap: true,
@@ -138,6 +138,7 @@ async function complex_build(watch: boolean): Promise<void> {
 	let ongoing_css = false;
 	if (watch) {
 		const watcher = chokidar.watch("src", { ignoreInitial: true });
+		const notifier = make_notifier(60808);
 		watcher.on("all", async (_, path) => {
 			if (!css_build) return;
 			if (path.includes(".#")) return;
@@ -160,6 +161,7 @@ async function complex_build(watch: boolean): Promise<void> {
 						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 						.catch((e) => console.error(e?.message));
 				}
+				notifier("css");
 				ongoing_css = false;
 			}
 			if (

package/src/notifier.ts

@@ -0,0 +1,22 @@
+import WebSocket from "ws";
+
+export function make_notifier(port: number) {
+	const server = new WebSocket.Server({
+		port,
+	});
+
+	let sockets: WebSocket[] = [];
+	server.on("connection", function (socket) {
+		sockets.push(socket);
+
+		// When a socket closes, or disconnects, remove it from the array.
+		socket.on("close", function () {
+			sockets = sockets.filter((s) => s !== socket);
+		});
+	});
+
+	console.log("build notifier listening on websocket at port " + port);
+	return function notify(message: string) {
+		sockets.forEach((s) => s.send(message));
+	};
+}

package/src/page/stateful-page.ts

@@ -128,31 +128,12 @@ export abstract class StatefulPage<
 
 		const modified_state = deepmerge(original_state, ctx.$body.$ || {}, {
 			arrayMerge: (
-				target: any[],
+				_target: any[],
 				source: any[],
-				options: ArrayMergeOptions
+				_options: ArrayMergeOptions
 			) => {
 				// https://github.com/TehShrike/deepmerge#user-content-arraymerge-example-combine-arrays
-				const destination = target.slice();
-
-				source.forEach((item, index) => {
-					if (typeof destination[index] === "undefined") {
-						destination[index] =
-							options.cloneUnlessOtherwiseSpecified(
-								item,
-								options
-							);
-					} else if (options.isMergeableObject(item)) {
-						destination[index] = deepmerge(
-							target[index],
-							item,
-							options
-						);
-					} else if (target.indexOf(item) === -1) {
-						destination.push(item);
-					}
-				});
-				return destination;
+				return source;
 			},
 		}) as State;