@moostjs/vite 0.6.37 → 0.6.38

package/dist/index.cjs

@@ -340,7 +340,7 @@ function _define_property(obj, key, value) {
 /**
 * Clean up Moost’s global containers and optionally remove specific instances from the registry.
 *
-* Every instance actually removed from a registry is **disposed** before the
+* Every instance actually removed from the registry is **disposed** before the
 * caches are dropped: its `@MoostDispose` hooks (or `Symbol.asyncDispose` /
 * `Symbol.dispose`) are awaited, so a singleton owning a connection, consumer,
 * timer or file handle releases it instead of leaking one copy per reload. An
@@ -349,46 +349,25 @@ function _define_property(obj, key, value) {
 *
 * @param {Set<string>} [cleanupInstances] A set of module IDs to remove from the registry.
 * @returns the instances that were ejected (and therefore disposed)
-*/ async function moostRestartCleanup(adapters, onEject, cleanupInstances) {
+*/ async function moostRestartCleanup(onEject, cleanupInstances) {
 	const logger = getLogger();
 	const infact = (0, moost.getMoostInfact)();
-	const { registry, scopes } = infact;
-	const registries = [registry, ...Object.values(scopes)];
+	const { registry } = infact;
 	infact._cleanup();
 	const mate = (0, moost.getMoostMate)();
-	/** Instances removed from a registry by this run — disposed below, before the caches drop. */ const ejected = [];
+	/** Instances removed from the registry by this run — disposed below, before the caches drop. */ const ejected = [];
 	if (cleanupInstances) {
-		for (const reg of registries) {
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				const viteId = mate.read(instance)?.__vite_id;
-				if (viteId && cleanupInstances.has(viteId)) {
-					logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
-					delete reg[key];
-					ejected.push(instance);
-				}
-			}
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				scanParams(instance, (type) => {
-					if ((type === moost.Moost || type instanceof moost.Moost || type.prototype instanceof moost.Moost) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "Moost")`);
-						return true;
-					}
-					for (const adapter of adapters) if (adapter.compare(type) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "${adapter.constructor.name}")`);
-						return true;
-					}
-				});
+		for (const key of Object.getOwnPropertySymbols(registry)) {
+			const instance = registry[key];
+			const viteId = mate.read(instance)?.__vite_id;
+			if (viteId && cleanupInstances.has(viteId)) {
+				logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
+				delete registry[key];
+				ejected.push(instance);
 			}
-			clearDependantRegistry(reg, onEject, ejected);
 		}
+		clearDependantRegistry(registry, onEject, ejected);
 		infact.registry = registry;
-		infact.scopes = scopes;
 	}
 	await disposeEjected(ejected);
 	(0, moost.getMoostMate)()._cleanup();
@@ -405,19 +384,21 @@ function _define_property(obj, key, value) {
 	for (const instance of disposed) logger.debug(`♻️  Disposed "${constructorName(instance)}"`);
 	for (const e of errors) logger.warn(`⚠️  Dispose hook "${constructorName(e.instance)}.${String(e.method)}" failed — the reload continues`);
 }
-function clearDependantRegistry(registry, onEject, ejected) {
+/**
+* Ejects, to a fixed point, every instance whose constructor dependency is not
+* in the registry: an instance ejected in one pass ejects its consumers in the
+* next (Moost → Database → Repository → Worker loses the whole chain). An
+* `onEject` veto keeps the instance present, and with it its consumers.
+*/ function clearDependantRegistry(registry, onEject, ejected) {
 	const logger = getLogger();
-	const objSet = /* @__PURE__ */ new Set();
 	let somethingIsDeleted = true;
 	while (somethingIsDeleted) {
 		somethingIsDeleted = false;
-		for (const key of Object.getOwnPropertySymbols(registry)) {
-			const instance = registry[key];
-			objSet.add(Object.getPrototypeOf(instance).constructor);
-		}
-		for (const key of Object.getOwnPropertySymbols(registry)) {
+		const keys = Object.getOwnPropertySymbols(registry);
+		const present = new Set(keys.map((key) => registry[key].constructor));
+		for (const key of keys) {
 			const instance = registry[key];
-			if (checkAndEject(instance, objSet, onEject, registry, key, logger)) {
+			if (checkAndEject(instance, present, onEject, registry, key, logger)) {
 				ejected.push(instance);
 				somethingIsDeleted = true;
 			}
@@ -429,7 +410,7 @@ function checkAndEject(instance, objSet, onEject, registry, key, logger) {
 	scanParams(instance, (type) => {
 		if (!objSet.has(type) && (!onEject || onEject(instance, type))) {
 			delete registry[key];
-			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}" which is not in registry)`);
+			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}", rebuilt by this reload)`);
 			ejected = true;
 			return true;
 		}
@@ -977,7 +958,7 @@ function moostVite(options) {
 						beginBoot();
 						const cleanupInstances = pendingCleanup ?? void 0;
 						pendingCleanup = null;
-						await moostRestartCleanup(adapters, options.onEject, cleanupInstances);
+						await moostRestartCleanup(options.onEject, cleanupInstances);
 						for (const adapter of adapters) if (adapter.detected) await adapter.init();
 						const entryModule = await getEntryModule(server.environments.ssr.moduleGraph);
 						if (entryModule?.transformResult) server.environments.ssr.moduleGraph.invalidateModule(entryModule);
@@ -999,7 +980,7 @@ function moostVite(options) {
 				}
 			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
-			await moostRestartCleanup(adapters, options.onEject);
+			await moostRestartCleanup(options.onEject);
 			await ssrImport(options.entry);
 			await settleBootInit();
 			server.middlewares.use(async (req, res, next) => {

package/dist/index.mjs

@@ -311,7 +311,7 @@ function _define_property(obj, key, value) {
 /**
 * Clean up Moost’s global containers and optionally remove specific instances from the registry.
 *
-* Every instance actually removed from a registry is **disposed** before the
+* Every instance actually removed from the registry is **disposed** before the
 * caches are dropped: its `@MoostDispose` hooks (or `Symbol.asyncDispose` /
 * `Symbol.dispose`) are awaited, so a singleton owning a connection, consumer,
 * timer or file handle releases it instead of leaking one copy per reload. An
@@ -320,46 +320,25 @@ function _define_property(obj, key, value) {
 *
 * @param {Set<string>} [cleanupInstances] A set of module IDs to remove from the registry.
 * @returns the instances that were ejected (and therefore disposed)
-*/ async function moostRestartCleanup(adapters, onEject, cleanupInstances) {
+*/ async function moostRestartCleanup(onEject, cleanupInstances) {
 	const logger = getLogger();
 	const infact = getMoostInfact();
-	const { registry, scopes } = infact;
-	const registries = [registry, ...Object.values(scopes)];
+	const { registry } = infact;
 	infact._cleanup();
 	const mate = getMoostMate();
-	/** Instances removed from a registry by this run — disposed below, before the caches drop. */ const ejected = [];
+	/** Instances removed from the registry by this run — disposed below, before the caches drop. */ const ejected = [];
 	if (cleanupInstances) {
-		for (const reg of registries) {
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				const viteId = mate.read(instance)?.__vite_id;
-				if (viteId && cleanupInstances.has(viteId)) {
-					logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
-					delete reg[key];
-					ejected.push(instance);
-				}
-			}
-			for (const key of Object.getOwnPropertySymbols(reg)) {
-				const instance = reg[key];
-				scanParams(instance, (type) => {
-					if ((type === Moost || type instanceof Moost || type.prototype instanceof Moost) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "Moost")`);
-						return true;
-					}
-					for (const adapter of adapters) if (adapter.compare(type) && (!onEject || onEject(instance, type))) {
-						delete reg[key];
-						ejected.push(instance);
-						logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on re-instantiated "${adapter.constructor.name}")`);
-						return true;
-					}
-				});
+		for (const key of Object.getOwnPropertySymbols(registry)) {
+			const instance = registry[key];
+			const viteId = mate.read(instance)?.__vite_id;
+			if (viteId && cleanupInstances.has(viteId)) {
+				logger.debug(`🔃 Replacing "${constructorName(instance)}"`);
+				delete registry[key];
+				ejected.push(instance);
 			}
-			clearDependantRegistry(reg, onEject, ejected);
 		}
+		clearDependantRegistry(registry, onEject, ejected);
 		infact.registry = registry;
-		infact.scopes = scopes;
 	}
 	await disposeEjected(ejected);
 	getMoostMate()._cleanup();
@@ -376,19 +355,21 @@ function _define_property(obj, key, value) {
 	for (const instance of disposed) logger.debug(`♻️  Disposed "${constructorName(instance)}"`);
 	for (const e of errors) logger.warn(`⚠️  Dispose hook "${constructorName(e.instance)}.${String(e.method)}" failed — the reload continues`);
 }
-function clearDependantRegistry(registry, onEject, ejected) {
+/**
+* Ejects, to a fixed point, every instance whose constructor dependency is not
+* in the registry: an instance ejected in one pass ejects its consumers in the
+* next (Moost → Database → Repository → Worker loses the whole chain). An
+* `onEject` veto keeps the instance present, and with it its consumers.
+*/ function clearDependantRegistry(registry, onEject, ejected) {
 	const logger = getLogger();
-	const objSet = /* @__PURE__ */ new Set();
 	let somethingIsDeleted = true;
 	while (somethingIsDeleted) {
 		somethingIsDeleted = false;
-		for (const key of Object.getOwnPropertySymbols(registry)) {
-			const instance = registry[key];
-			objSet.add(Object.getPrototypeOf(instance).constructor);
-		}
-		for (const key of Object.getOwnPropertySymbols(registry)) {
+		const keys = Object.getOwnPropertySymbols(registry);
+		const present = new Set(keys.map((key) => registry[key].constructor));
+		for (const key of keys) {
 			const instance = registry[key];
-			if (checkAndEject(instance, objSet, onEject, registry, key, logger)) {
+			if (checkAndEject(instance, present, onEject, registry, key, logger)) {
 				ejected.push(instance);
 				somethingIsDeleted = true;
 			}
@@ -400,7 +381,7 @@ function checkAndEject(instance, objSet, onEject, registry, key, logger) {
 	scanParams(instance, (type) => {
 		if (!objSet.has(type) && (!onEject || onEject(instance, type))) {
 			delete registry[key];
-			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}" which is not in registry)`);
+			logger.debug(`✖️  Ejecting "${constructorName(instance)}" (depends on "${type.name}", rebuilt by this reload)`);
 			ejected = true;
 			return true;
 		}
@@ -946,7 +927,7 @@ function moostVite(options) {
 						beginBoot();
 						const cleanupInstances = pendingCleanup ?? void 0;
 						pendingCleanup = null;
-						await moostRestartCleanup(adapters, options.onEject, cleanupInstances);
+						await moostRestartCleanup(options.onEject, cleanupInstances);
 						for (const adapter of adapters) if (adapter.detected) await adapter.init();
 						const entryModule = await getEntryModule(server.environments.ssr.moduleGraph);
 						if (entryModule?.transformResult) server.environments.ssr.moduleGraph.invalidateModule(entryModule);
@@ -968,7 +949,7 @@ function moostVite(options) {
 				}
 			};
 			for (const adapter of adapters) adapter.ssrLoadModule = ssrImport;
-			await moostRestartCleanup(adapters, options.onEject);
+			await moostRestartCleanup(options.onEject);
 			await ssrImport(options.entry);
 			await settleBootInit();
 			server.middlewares.use(async (req, res, next) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@moostjs/vite",
-  "version": "0.6.37",
+  "version": "0.6.38",
   "description": "Vite Dev plugin for moostjs",
   "keywords": [
     "composables",
@@ -58,8 +58,8 @@
   "peerDependencies": {
     "sirv": "^3.0.0",
     "vite": "^8.0.0",
-    "@moostjs/event-http": "^0.6.37",
-    "moost": "^0.6.37"
+    "@moostjs/event-http": "^0.6.38",
+    "moost": "^0.6.38"
   },
   "peerDependenciesMeta": {
     "sirv": {